[svnbook commit] r1238 - trunk/src/en/book
cmpilato
svnbook-dev at red-bean.com
Mon Apr 25 23:30:36 CDT 2005
Author: cmpilato
Date: Mon Apr 25 23:30:35 2005
New Revision: 1238
Modified:
trunk/src/en/book/ch04.xml
Log:
Small fix to a bug noticed by Robert Tasarz (robert.tasarz at greentech.pl).
Modified: trunk/src/en/book/ch04.xml
==============================================================================
--- trunk/src/en/book/ch04.xml (original)
+++ trunk/src/en/book/ch04.xml Mon Apr 25 23:30:35 2005
@@ -1593,14 +1593,14 @@
special case, you would merge by comparing the branch with
the trunk:</para>
-<screen>
+ <screen>
$ cd trunk-working-copy
$ svn update
At revision 1910.
$ svn merge http://svn.example.com/repos/calc/trunk@1910 \
- http://svn.example.com/repos/calc/branches/mybranch@1910 \
+ http://svn.example.com/repos/calc/branches/mybranch@1910
U real.c
U integer.c
A newdirectory
More information about the svnbook-dev
mailing list