subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1783418 - /subversion/site/publish/docs/release-notes/1.10.html
Date Fri, 17 Feb 2017 16:04:00 GMT
Author: stsp
Date: Fri Feb 17 16:03:59 2017
New Revision: 1783418

URL: http://svn.apache.org/viewvc?rev=1783418&view=rev
Log:
* site/publish/docs/release-notes/1.10.html: Wording tweaks.

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=1783418&r1=1783417&r2=1783418&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Fri Feb 17 16:03:59 2017
@@ -241,10 +241,11 @@ 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>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
+<p>The new conflict resolver can be driven interactively with
+   <tt>svn resolve</tt>, 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>
+   tool which is intended for use in shell 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



Mime
View raw message