[svnbook] r5594 committed - trunk/en/book/ch02-basic-usage.xml
richardcavell at users.sourceforge.net
richardcavell at users.sourceforge.net
Thu Jan 18 09:11:26 CST 2018
Revision: 5594
http://sourceforge.net/p/svnbook/source/5594
Author: richardcavell
Date: 2018-01-18 15:11:26 +0000 (Thu, 18 Jan 2018)
Log Message:
-----------
Fix grammer in chapter 02.
"the svn resolve required" -> "the svn resolve command required"
Modified Paths:
--------------
trunk/en/book/ch02-basic-usage.xml
Modified: trunk/en/book/ch02-basic-usage.xml
===================================================================
--- trunk/en/book/ch02-basic-usage.xml 2018-01-18 15:09:13 UTC (rev 5593)
+++ trunk/en/book/ch02-basic-usage.xml 2018-01-18 15:11:26 UTC (rev 5594)
@@ -1815,7 +1815,7 @@
the <option>--accept</option> option, which allows you
specify your desired approach for resolving the conflict.
Prior to Subversion 1.8, the <command>svn resolve</command>
- <emphasis>required</emphasis> the use of this option.
+ command <emphasis>required</emphasis> the use of this option.
Subversion now allows you to run the <command>svn
resolve</command> command without that option. When you do
so, Subversion cranks up its interactive conflict resolution
More information about the svnbook-dev
mailing list