[svnbook] r4227 committed - Merge r4226 from trunk.

[svnbook at googlecode.com]

Revision: 4227
Author:   stsp at elego.de
Date:     Mon Nov 28 14:59:28 2011
Log:      Merge r4226 from trunk.

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

Modified:
  /branches/1.7
  /branches/1.7/en
  /branches/1.7/en/book/ch09-reference.xml

=======================================
--- /branches/1.7/en/book/ch09-reference.xml	Thu Nov 10 12:36:36 2011
+++ /branches/1.7/en/book/ch09-reference.xml	Mon Nov 28 14:59:28 2011
@@ -3706,8 +3706,6 @@

          <informalexample>
            <screen>
-$ cd myproj
-            U    thhgttg.txt
  $ svn merge -c 31 ^/trunk/thhgttg.txt thhgttg.txt
  --- Merging r31 into 'thhgttg.txt':
  U    thhgttg.txt