diff options
| author | peter <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
| commit | c18b5d7f26f112be58bb1c4660799dea49f219ba (patch) | |
| tree | 013c2e6845398e5a9ca4901dcc077769c7520e1d /subversion/svn/resolve-cmd.c | |
| parent | 91308aec6ca93cab82659cd43b3f6a83d366350b (diff) | |
| download | FreeBSD-src-c18b5d7f26f112be58bb1c4660799dea49f219ba.zip FreeBSD-src-c18b5d7f26f112be58bb1c4660799dea49f219ba.tar.gz | |
Vendor import of subversion-1.9.2
Diffstat (limited to 'subversion/svn/resolve-cmd.c')
| -rw-r--r-- | subversion/svn/resolve-cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/subversion/svn/resolve-cmd.c b/subversion/svn/resolve-cmd.c index ce4818e..035bf29 100644 --- a/subversion/svn/resolve-cmd.c +++ b/subversion/svn/resolve-cmd.c @@ -123,7 +123,7 @@ svn_cl__resolve(apr_getopt_t *os, svn_pool_destroy(iterpool); if (had_error) - return svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL, + return svn_error_create(SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE, NULL, _("Failure occurred resolving one or more " "conflicts")); |
