Author: stsp
Date: Mon Aug 25 15:27:27 2014
New Revision: 1620346
URL: http://svn.apache.org/r1620346
Log:
* STATUS: Nominate r1620332.
Modified:
subversion/branches/1.8.x/STATUS
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1620346&r1=1620345&r2=1620346&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Aug 25 15:27:27 2014
@@ -157,6 +157,15 @@ Candidate changes:
Votes:
+1: julianfoad
+ * r1620332
+ Remove broken conflict resolver menu options.
+ Justification:
+ svn shouldn't offer menu options that always error out.
+ Notes:
+ Run merge with --accept theirs-conflict
+ Votes:
+ +1: stsp
+
Veto-blocked changes:
=====================
