Author: stsp
Date: Fri Mar 2 11:49:13 2018
New Revision: 1825712
URL: http://svn.apache.org/viewvc?rev=1825712&view=rev
Log:
* STATUS: Nominate r1825711.
Modified:
subversion/branches/1.10.x/STATUS
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1825712&r1=1825711&r2=1825712&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Mar 2 11:49:13 2018
@@ -23,7 +23,7 @@ Candidate changes:
Votes:
+1: brane
- * r1825709
+ * r1825709, r1825711
Don't offer conflict resolution options for 'local move vs incoming move'.
Justication:
The resolver does not support 'move vs move' resolution yet.
