Author: rhuijben
Date: Fri Dec 6 18:23:25 2013
New Revision: 1548642
URL: http://svn.apache.org/r1548642
Log:
* STATUS: Nominate r1548486.
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=1548642&r1=1548641&r2=1548642&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Dec 6 18:23:25 2013
@@ -205,6 +205,14 @@ Candidate changes:
Votes:
+1: rhuijben
+ * r1548486
+ When (during merge) we compare three files to each other stop readining
+ specific files when we find enough differences.
+ Justification:
+ Trivial fix that can have a hughe performance impact for some users.
+ Votes:
+ +1: rhuijben
+
Veto-blocked changes:
=====================
