"Daniel L. Rall" <dlr@finemaltcoding.com> writes:
> Index: doc/book/book/ch03.xml
> ===================================================================
> --- doc/book/book/ch03.xml (revision 7212)
> +++ doc/book/book/ch03.xml (working copy)
> @@ -541,6 +541,7 @@
> <para>File <filename>foo</filename> received new changes
> from the repository, but your local copy of the file had
> your modifications. The changes did not intersect,
> + <!-- HELP: What if WC already contains repository changes? -->
> however, so Subversion has
> mer<computeroutput>G</computeroutput>ed the repository's
> changes into the file without a problem.</para>
Hey Fitz... you should fix this. Basically, the text should be
something like, "Either the changes did not intersect at all, or the
changes were exactly the same."
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Sep 28 15:25:47 2003