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

Posted to commits@subversion.apache.org by ju...@apache.org on 2013/04/23 23:33:47 UTC

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

Author: julianfoad
Date: Tue Apr 23 21:33:47 2013
New Revision: 1471154

URL: http://svn.apache.org/r1471154
Log:
* STATUS: Add r1471153 to the r1470238 nomination.

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=1471154&r1=1471153&r2=1471154&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Tue Apr 23 21:33:47 2013
@@ -72,7 +72,7 @@ Candidate changes:
    Votes:
      +1: rhuijben
 
- * r1470238
+ * r1470238, r1471153
    Improve labelling of the file diff in interactive conflict resolution 'df'
    option. Show labels such as "THEIRS" and "MERGED", not just the paths to
    the files on disk.