You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/07/06 11:31:16 UTC
svn commit: r1358091 - /subversion/trunk/subversion/svn/conflict-callbacks.c
Author: stsp
Date: Fri Jul 6 09:31:16 2012
New Revision: 1358091
URL: http://svn.apache.org/viewvc?rev=1358091&view=rev
Log:
* subversion/svn/conflict-callbacks.c
(launch_resolver): Suggest trying the "(m) merge" option if an error ocurred
while launching an external merge tool.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1358091&r1=1358090&r2=1358091&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Fri Jul 6 09:31:16 2012
@@ -241,14 +241,16 @@ launch_resolver(svn_boolean_t *performed
{
SVN_ERR(svn_cmdline_fprintf(stderr, pool, "%s\n",
err->message ? err->message :
- _("No merge tool found.\n")));
+ _("No merge tool found, "
+ "try '(m) merge' instead.\n")));
svn_error_clear(err);
}
else if (err && err->apr_err == SVN_ERR_EXTERNAL_PROGRAM)
{
SVN_ERR(svn_cmdline_fprintf(stderr, pool, "%s\n",
err->message ? err->message :
- _("Error running merge tool.")));
+ _("Error running merge tool, "
+ "try '(m) merge' instead.")));
svn_error_clear(err);
}
else if (err)