[PATCH] Resolved

Richard Cavell richardcavell at mail.com
Sat Oct 1 21:32:17 CDT 2011

In Chapter 2, when describing interactive conflict resolution, the book says that one can use the "resolve" command. This is actually presented to the user during interactive conflict resolution as the "resolved" command.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.red-bean.com/pipermail/svnbook-dev/attachments/20111001/a2e4789d/attachment.html>
-------------- next part --------------
Index: ch02-basic-usage.xml
--- ch02-basic-usage.xml	(revision 4100)
+++ ch02-basic-usage.xml	(working copy)
@@ -1524,7 +1524,7 @@
           />).  After you've edited the file, if you're satisfied with
           the changes you've made, you can tell Subversion that the
           edited file is no longer in conflict by using
-          the <quote>resolve</quote> command
+          the <quote>resolved</quote> command
         <para>Regardless of what your local Unix snob will likely tell

More information about the svnbook-dev mailing list