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 2017/02/18 12:17:27 UTC

svn commit: r1783523 - /subversion/trunk/tools/client-side/svnconflict/README

Author: stsp
Date: Sat Feb 18 12:17:27 2017
New Revision: 1783523

URL: http://svn.apache.org/viewvc?rev=1783523&view=rev
Log:
* tools/client-side/svnconflict/README: Fix a typo.

Modified:
    subversion/trunk/tools/client-side/svnconflict/README

Modified: subversion/trunk/tools/client-side/svnconflict/README
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnconflict/README?rev=1783523&r1=1783522&r2=1783523&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnconflict/README (original)
+++ subversion/trunk/tools/client-side/svnconflict/README Sat Feb 18 12:17:27 2017
@@ -17,7 +17,7 @@ Resolve prop conflict PATH: svnconflict
 Resolve tree conflict PATH: svnconflict resolve-tree OPTION_ID PATH
 
 Note that some advanced operations which are offered by 'svn resolve' are not
-supported, such as selecting a move target path from set of ambiguous move
+supported, such as selecting a move target path from a set of ambiguous move
 target candidates. svnconflict will always use a default choice in such cases.
 
 svnconflict may contact the repository to obtain information about a conflict.