[svnbook] r3699 committed - * src/en/book/ch04-branching-and-merging.xml...

[svnbook at googlecode.com]

Revision: 3699
Author: stsp at elego.de
Date: Wed Feb 17 05:05:48 2010
Log: * src/en/book/ch04-branching-and-merging.xml
   (svn.branchmerge.advanced.reintegratetwice): Wording tweak; s/X/revision  
X/

http://code.google.com/p/svnbook/source/detail?r=3699

Modified:
  /trunk/src/en/book/ch04-branching-and-merging.xml

=======================================
--- /trunk/src/en/book/ch04-branching-and-merging.xml	Wed Feb 17 04:49:47  
2010
+++ /trunk/src/en/book/ch04-branching-and-merging.xml	Wed Feb 17 05:05:48  
2010
@@ -1792,10 +1792,10 @@

        <para>It should now also be apparent why deleting the branch and
          re-creating it has the same effect as doing the above record-only
-        merge. Because <emphasis>X</emphasis> is part of the natural  
history
-        of the newly created branch, Subversion will never attempt to merge
-        revision <emphasis>X</emphasis> into the branch, avoiding spurious
-        conflicts.</para>
+        merge. Because revision <emphasis>X</emphasis> is part of the  
natural
+        history of the newly created branch, Subversion will never attempt  
to
+        merge revision <emphasis>X</emphasis> into the branch, avoiding
+        spurious conflicts.</para>

        </sect2>