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 2013/06/11 16:53:55 UTC

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

Author: stsp
Date: Tue Jun 11 14:53:55 2013
New Revision: 1491818

URL: http://svn.apache.org/r1491818
Log:
* STATUS: Propose r1491816.

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=1491818&r1=1491817&r2=1491818&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Jun 11 14:53:55 2013
@@ -115,6 +115,14 @@ Candidate changes:
     Votes:
       +1: stsp
 
+  * r1491816
+    Add two additional options to interactive file merge.
+    Justification:
+      Usability enhancement for quicker conflict resolution in some cases.
+      Very simple change. Only affects interactive mode, not scripts.
+    Votes:
+      +1: stsp
+
 Veto-blocked changes:
 =====================