subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn propchange: r1574459 - svn:log
Date Wed, 05 Mar 2014 12:49:43 GMT
Author: stsp
Revision: 1574459
Modified property: svn:log

Modified: svn:log at Wed Mar  5 12:49:43 2014
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Mar  5 12:49:43 2014
@@ -1,4 +1,3 @@
 * subversion/svn/conflict-callbacks.c
-  (handle_text_conflict): Use svn_err_best_message() instead of hand-rolling
-   an error messsage to fall back on. Inform the user if falling back to the
-   internal merge tool.
+  (handle_text_conflict): Inform the user if falling back to the internal
+   merge tool.


Mime
View raw message