subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1358105 - /subversion/trunk/CHANGES
Date Fri, 06 Jul 2012 10:22:35 GMT
Author: stsp
Date: Fri Jul  6 10:22:34 2012
New Revision: 1358105

URL: http://svn.apache.org/viewvc?rev=1358105&view=rev
Log:
* CHANGES: List the built-in file merge tool as minor improvement for 1.8.

Modified:
    subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1358105&r1=1358104&r2=1358105&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Fri Jul  6 10:22:34 2012
@@ -26,6 +26,7 @@ http://svn.apache.org/repos/asf/subversi
     * ra_serf avoids re-downloading content present in pristine store (r1333936)
     * 'svn mergeinfo' now honors the --revision (-r) option (issue #4199)
     * new --search and --isearch options for 'svn log' (r1354666, -830)
+    * new built-in interactive text conflict merge tool (r1357864, et al)
 
   - Client-side bugfixes:
     *



Mime
View raw message