You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by st...@apache.org on 2015/03/11 12:30:29 UTC

svn commit: r1665847 - /subversion/branches/1.8.x/STATUS

Author: stsp
Date: Wed Mar 11 11:30:29 2015
New Revision: 1665847

URL: http://svn.apache.org/r1665847
Log:
* STATUS: Remove r1524145 nomination since it was vetoed and
   I don't intend to pursue it further.

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=1665847&r1=1665846&r2=1665847&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed Mar 11 11:30:29 2015
@@ -173,16 +173,6 @@ 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@, <52...@reser.org>)
-
  * r1619380, r1619393
    Fix diff of a locally copied directory with props: it showed all props
    as added instead of a diff against the copy-from props.