Author: stsp
Revision: 1731226
Modified property: svn:log
Modified: svn:log at Fri Feb 19 12:43:51 2016
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Fri Feb 19 12:43:51 2016
@@ -1,3 +1,5 @@
+[ Reverted in r1731237. ]
+
* subversion/libsvn_client/resolved.c
(resolve_tree_conflict): Only break moves if incoming change is 'replace'
rather than 'delete'. Matches the behaviour of old resolver more closely.