Author: stsp
Date: Fri Mar  2 11:37:17 2018
New Revision: 1825710

URL: http://svn.apache.org/viewvc?rev=1825710&view=rev
Log:
* STATUS: Nominate r1825709.

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=1825710&r1=1825709&r2=1825710&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Fri Mar  2 11:37:17 2018
@@ -23,6 +23,14 @@ Candidate changes:
    Votes:
      +1: brane
 
+ * r1825709
+   Don't offer conflict resolution options for 'local move vs incoming move'.
+   Justication:
+     The resolver does not support 'move vs move' resolution yet.
+     The current behaviour is misleading.
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================
 


Reply via email to