svn commit: r1661246 - /subversion/site/publish/docs/release-notes/1.9.html

[danielsh]

Author: danielsh
Date: Fri Feb 20 23:57:26 2015
New Revision: 1661246

URL: http://svn.apache.org/r1661246
Log:
* docs/release-notes/1.9.html
  (#svn-resolver-m): New placeholder item.

Modified:
    subversion/site/publish/docs/release-notes/1.9.html

Modified: subversion/site/publish/docs/release-notes/1.9.html
URL: 
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.9.html?rev=1661246&r1=1661245&r2=1661246&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.9.html (original)
+++ subversion/site/publish/docs/release-notes/1.9.html Fri Feb 20 23:57:26 2015
@@ -634,6 +634,19 @@ support reading or writing FSX repositor
 </p>
 </div> <!-- svn-youngest -->
 
+<div class="h4" id="svn-resolver-m">
+<h4>Interactive conflict resolver changes
+  <a class="sectionlink" href="#svn-resolver-m"
+     title="Link to this section">&para;</a>
+</h4>
+
+<p class="todo">The 'm' command now tries the external merge tool if it is
+defined, else the internal diff3 implementation.  In 1.8 it always used the
+internal diff3.  The 'i' command was added with the old meaning of the 'm'
+command.</p>
+
+</div> <!-- svn-resolver-m -->
+
 </div> <!-- cmdline -->
 
 <div class="h3" id="svnadmin-improvements">