You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2013/02/04 14:47:56 UTC

svn propchange: r1441810 - svn:log

Author: julianfoad
Revision: 1441810
Modified property: svn:log

Modified: svn:log at Mon Feb  4 13:47:56 2013
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Mon Feb  4 13:47:56 2013
@@ -4,6 +4,9 @@ requested range.  (2) When aborting with
 describing only the current sub-range, not the sub-ranges merged before the
 conflict.
 
+This is issue #4306 'multiple editor drive file merges record wrong
+mergeinfo during conflicts'.
+
 * subversion/libsvn_client/merge.c
   (do_file_merge): Take an 'abort_on-conflicts' flag and use it so that we
     abort on conflicts in all but the last sub-range of the last specified