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/08/05 22:00:12 UTC

svn commit: r1694309 - /subversion/trunk/CHANGES

Author: stsp
Date: Wed Aug  5 20:00:12 2015
New Revision: 1694309

URL: http://svn.apache.org/r1694309
Log:
* CHANGES: Remove unclear reference to improved interactive conflict
   resolution menus which doesn't point out what actually did improve
   and has no link to revision or issue number.

Modified:
    subversion/trunk/CHANGES

Modified: subversion/trunk/CHANGES
URL: http://svn.apache.org/viewvc/subversion/trunk/CHANGES?rev=1694309&r1=1694308&r2=1694309&view=diff
==============================================================================
--- subversion/trunk/CHANGES (original)
+++ subversion/trunk/CHANGES Wed Aug  5 20:00:12 2015
@@ -9,7 +9,6 @@ http://svn.apache.org/repos/asf/subversi
 
   - Major new features:
     * fsfs: new format 7 with more efficient on-disk layout (r1547045 et al)
-    * resolve: improve interactive conflict resolution menus
     * blame: support showing prospective as well as previous changes
     * info: support printing of individual values with --show-item (r1662620)
     * svn auth: new subcommand to manage cached credentials and certs