Author: breser
Date: Wed Nov 13 04:23:04 2013
New Revision: 1541383
URL: http://svn.apache.org/r1541383
Log:
* STATUS: Veto 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=1541383&r1=1541382&r2=1541383&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Nov 13 04:23:04 2013
@@ -62,15 +62,6 @@ Candidate changes:
a related problem. It looks like this fix doesn't work for
the user scenario it was intended for)
- * 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
-
* r1534149, r1535676
In the windows CryptoAPI ssl certificate verification, properly handle
certificates that are only trusted via intermediate authorities.
@@ -188,6 +179,16 @@ Candidate changes:
Veto-blocked changes:
=====================
+ * 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
+ -1: breser (see my email to dev@, <5282fe15.40...@reser.org>)
+
Approved changes:
=================
