Author: stsp
Revision: 1524145
Modified property: svn:log
Modified: svn:log at Tue Sep 17 18:02:15 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Tue Sep 17 18:02:15 2013
@@ -6,6 +6,7 @@ Avoids confusion if users configure an e
attempt to use the 'm' option to launch that tool (instead of using
the 'l' option).
+See issue #4426.
* subversion/svn/conflict-callbacks.c
(launch_resolver): Return any error from svn_cl__merge_file_externally(),
