svn commit: r1739923 - /subversion/trunk/subversion/svn/conflict-callbacks.c

[st...@apache.org]

Author: stsp
Date: Tue Apr 19 12:39:52 2016
New Revision: 1739923

URL: http://svn.apache.org/viewvc?rev=1739923&view=rev
Log:
* subversion/svn/conflict-callbacks.c
  (handle_text_conflict): Clearly label merge conflicts as such, to mark
   the difference to tree and property conflicts. Users may now encounter
   new text/prop conflicts after resolving a tree conflict interactively.
   Hopefully, this wording tweak makes things a bit less confusing.

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=1739923&r1=1739922&r2=1739923&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Tue Apr 19 12:39:52 2016
@@ -817,11 +817,12 @@ handle_text_conflict(svn_boolean_t *reso
 
   if (is_binary)
     SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
-                                _("Conflict discovered in binary file '%s'.\n"),
+                                _("Merge conflict discovered in binary "
+                                  "file '%s'.\n"),
                                 local_relpath));
   else
     SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool,
-                                _("Conflict discovered in file '%s'.\n"),
+                                _("Merge conflict discovered in file '%s'.\n"),
                                 local_relpath));
 
   /* ### TODO This whole feature availability check is grossly outdated.