subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1438884 - /subversion/branches/1.7.x/STATUS
Date Sat, 26 Jan 2013 11:55:55 GMT
Author: stsp
Date: Sat Jan 26 11:55:55 2013
New Revision: 1438884

URL: http://svn.apache.org/viewvc?rev=1438884&view=rev
Log:
* STATUS: Nominate r1438879.

Modified:
    subversion/branches/1.7.x/STATUS

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1438884&r1=1438883&r2=1438884&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Sat Jan 26 11:55:55 2013
@@ -215,6 +215,16 @@ Candidate changes:
    Votes:
      +1: stsp
 
+ * r1438879
+   Make 'show-diff' at the interactive conflict prompt show nicer diffs.
+   Justification:
+     'show-diff' produces unreadable diffs in some cases, especially with
+     conflicts recorded during merges.
+   Branch:
+     ^/subversion/branches/1.7.x-r1438879
+   Votes:
+     +1: stsp
+
 Veto-blocked changes:
 =====================
 



Mime
View raw message