Author: stsp Revision: 1449727 Modified property: svn:log Modified: svn:log at Mon Feb 25 14:46:52 2013 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Mon Feb 25 14:46:52 2013 @@ -1,4 +1,4 @@ -For a incoming-edit vs. local-delete tree conflict, where the locally +For an incoming-edit vs. local-delete tree conflict, where the locally deleted subtree has moved-away children, make 'svn resolve --accept working' break moves without updating any moved-away nodes, and make 'svn resolve --accept mine-conflict' flag incoming edit vs. local-move conflicts on
