[svnbook] r5000 committed - Fix issue 228: Dubious "svn merge" output. Reported by gan.ainm.riomh...

svnbook at googlecode.com svnbook at googlecode.com
Mon Feb 23 14:14:42 CST 2015


Revision: 5000
Author:   cmpilato at gmail.com
Date:     Mon Feb 23 20:14:18 2015 UTC
Log:      Fix issue 228: Dubious "svn merge" output.  Reported by  
gan.ainm.riomhphost.

* en/book/ch04-branching-and-merging.xml
   Fix the output of a 2-URL 'svn merge'.


https://code.google.com/p/svnbook/source/detail?r=5000

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

=======================================
--- /trunk/en/book/ch04-branching-and-merging.xml	Fri Mar 28 14:22:50 2014  
UTC
+++ /trunk/en/book/ch04-branching-and-merging.xml	Mon Feb 23 20:14:18 2015  
UTC
@@ -4628,7 +4628,7 @@
  $ cd libcomplex-custom
  $ svn merge ^/vendor/libcomplex-1.0.0 \
              ^/vendor/libcomplex-1.0.1
---- Merging differences between URLs into '.':
+--- Merging differences between repository URLs into '.':
  U    src/code.h
  C    src/code.c
  U    README



More information about the svnbook-dev mailing list