[svnbook commit] r2907 - trunk/src/en/book
sussman
noreply at red-bean.com
Sat Dec 8 19:16:13 CST 2007
Author: sussman
Date: Sat Dec 8 19:16:11 2007
New Revision: 2907
Log:
Fix some output syntax in the new chapter 4.
* src/en/book/ch04-branching-and-merging.xml: fix merge output.
Modified:
trunk/src/en/book/ch04-branching-and-merging.xml
Modified: trunk/src/en/book/ch04-branching-and-merging.xml
==============================================================================
--- trunk/src/en/book/ch04-branching-and-merging.xml (original)
+++ trunk/src/en/book/ch04-branching-and-merging.xml Sat Dec 8 19:16:11 2007
@@ -491,6 +491,7 @@
/home/user/my-calc-branch
$ svn merge http://svn.example.com/repos/calc/trunk
+--- Merging r345 through r356 into '.':
U button.c
U integer.c
</screen>
@@ -593,6 +594,7 @@
<screen>
$ svn merge http://svn.example.com/repos/calc/trunk
+--- Merging r357 through r380 into '.':
U integer.c
U Makefile
A README
@@ -613,6 +615,7 @@
<screen>
$ svn merge http://svn.example.com/repos/calc/trunk
+--- Merging r381 through r385 into '.':
U button.c
U README
@@ -640,6 +643,7 @@
/home/user/calc-trunk
$ svn merge http://svn.example.com/repos/calc/branches/my-calc-branch
+--- Merging r341 through r390 into '.':
U button.c
U integer.c
U Makefile
More information about the svnbook-dev
mailing list