<div dir="ltr"><span style="font-family:monospace,monospace">Hi, Mike<br><br>I found another wrong filename in chapter 4. According to the example<br>proposed, the file should be whole.c, instead of integer.c.<br><br></span><div class="gmail_default"><span style="font-family:monospace,monospace">​​Index: book/ch04-branching-and-merging.xml<br>===================================================================<br>diff --git a/trunk/en/book/ch04-branching-and-merging.xml b/trunk/en/book/ch04-branching-and-merging.xml<br>--- a/trunk/en/book/ch04-branching-and-merging.xml    (revision 5488)<br>+++ b/trunk/en/book/ch04-branching-and-merging.xml    (working copy)<br>@@ -3149,7 +3149,7 @@ Summary of conflicts:<br>         combine those changes, but rather raises a tree conflict<footnote><br>         <para>If Sally hadn't made her change in r472, then Subversion would<br>         notice that <filename>integer.c</filename> in the<br>-        target working copy is identical to <filename>integer.c</filename><br>+        target working copy is identical to <filename>whole.c</filename><br>         in the left-side of the merge and would allow your rename to<br>         succeed without a tree conflict:</para><br>         <informalexample><br><br></span></div></div>