Index: ch02-basic-usage.xml
===================================================================
--- ch02-basic-usage.xml (revision 5582)
+++ ch02-basic-usage.xml (working copy)
@@ -1323,8 +1323,8 @@
no local changes but was updated with changes from the
repository. One marked with
G had local changes to begin
- with, but the changes coming from the repository didn't
- overlap with those local changes.
+ with, but there are also changes coming from the repository,
+ which conflict with those local changes.
It's the next few lines which are interesting. First,
Subversion reports to you that in its attempt to merge