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 2015/11/11 12:00:39 UTC

svn propchange: r1713718 - svn:log

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

Modified: svn:log at Wed Nov 11 11:00:39 2015
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Nov 11 11:00:39 2015
@@ -1,5 +1,6 @@
 On the 'move-tracking-2' branch: Make 'svnmover revert' also discard all
-conflicts, like 'svn revert' does.
+conflicts, like 'svn revert' does, and don't raise an error when a merge
+raises conflicts.
 
 Also fix some memory allocation bugs.