[svnbook] r4766 committed - Fix Issue #214 ("ch02: typo in svn.tour.cycle.resolve.pending")....

svnbook at googlecode.com svnbook at googlecode.com
Thu May 1 21:29:11 CDT 2014


Revision: 4766
Author:   cmpilato at gmail.com
Date:     Fri May  2 02:29:01 2014 UTC
Log:      Fix Issue #214 ("ch02: typo in svn.tour.cycle.resolve.pending").

* en/book/ch02-basic-usage.xml
   Fix spelling error ("conlict" => "conflict").

Patch by: thosch97

http://code.google.com/p/svnbook/source/detail?r=4766

Modified:
  /trunk/en/book/ch02-basic-usage.xml

=======================================
--- /trunk/en/book/ch02-basic-usage.xml	Mon Apr  7 14:59:26 2014 UTC
+++ /trunk/en/book/ch02-basic-usage.xml	Fri May  2 02:29:01 2014 UTC
@@ -1754,7 +1754,7 @@
            changes.  You'll do this with the <command>svn
            resolve</command> command.  This command accepts
            the <option>--accept</option> option, which allows you
-          specify your desired approach for resolving the conlict.
+          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.
            Subversion now allows you to run the <command>svn



More information about the svnbook-dev mailing list