[PATCH] Resolved

Stefan Sperling stsp at elego.de
Mon Oct 3 04:25:35 CDT 2011


On Sat, Oct 01, 2011 at 10:32:17PM -0400, Richard Cavell wrote:
> 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.

I've committed this patch, and your other 2 patches, in r4101.

Thanks!

> 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
>            (<literal>r</literal>).</para>
>  
>          <para>Regardless of what your local Unix snob will likely tell

> _______________________________________________
> svnbook-dev mailing list
> svnbook-dev at red-bean.com
> http://www.red-bean.com/mailman/listinfo/svnbook-dev





More information about the svnbook-dev mailing list