svn commit: r1783417 - /subversion/site/publish/docs/release-notes/1.10.html

[st...@apache.org]

Author: stsp
Date: Fri Feb 17 15:57:45 2017
New Revision: 1783417

URL: http://svn.apache.org/viewvc?rev=1783417&view=rev
Log:
* site/publish/docs/release-notes/1.10.html: Link to svnconflict.

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

Modified: subversion/site/publish/docs/release-notes/1.10.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1783417&r1=1783416&r2=1783417&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Fri Feb 17 15:57:45 2017
@@ -241,9 +241,10 @@ href="https://wiki.apache.org/subversion
    to appear. The <tt>svn resolve</tt> command will keep iterating over such conflicts
    until none are left, or until the user decides to quit the operation.</p>
 
-<p>At present, the conflict resolver can be used interactively or called
-   from Subversion's client API. There is no support for non-interactive
-   conflict resolution with the <tt>svn</tt> command yet.</p>
+<p>The new conflict resolver can be driven interactively, from Subversion's
+   client API (in C and other language bindings), or with the non-interactive <a
+   href="https://svn.apache.org/repos/asf/subversion/trunk/tools/client-side/svnconflict">svnconflict</a>
+   tool which is intended for use in non-interactive merge scripts.</p>
 
 <p>The new conflict resolver offers a variety of automated tree conflict resolution
    options which users can choose from. Not all kinds of tree conflicts can yet be