Author: stsp
Date: Tue Sep 17 18:05:52 2013
New Revision: 1524150
URL: http://svn.apache.org/r1524150
Log:
* STATUS: Nominate r1524145.
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=1524150&r1=1524149&r2=1524150&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Sep 17 18:05:52 2013
@@ -172,6 +172,15 @@ Candidate changes:
Votes:
+1: rhuijben, stsp
+ * r1524145
+ Make the 'm' conflict prompt option run external merge tool if configured.
+ Justification:
+ Usability fix. The current behaviour ('m' -> internal merge tool,
+ 'l' -> external merge tool) confuses users who try 'm' to run an
+ external merge tool. See issue #4426.
+ Votes:
+ +1: stsp
+
Veto-blocked changes:
=====================
