[svnbook] r4542 committed - Translation: Merges and Moves
svnbook at googlecode.com
svnbook at googlecode.com
Thu Sep 19 14:19:00 CDT 2013
Revision: 4542
Author: jmfelderhoff at gmx.eu
Date: Thu Sep 19 19:18:47 2013 UTC
Log: Translation: Merges and Moves
http://code.google.com/p/svnbook/source/detail?r=4542
Modified:
/branches/1.6/de/book/ch04-branching-and-merging.xml
=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml Thu Sep 5
20:17:23 2013 UTC
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml Thu Sep 19
19:18:47 2013 UTC
@@ -4546,7 +4546,7 @@
new <filename>whole.c</filename> file—which is a
duplicate of the <emphasis>older</emphasis> version
of <filename>integer.c</filename>. The net effect is that
- merging your <quote>rename</quote> to the branch has removed
+ merging your <quote>rename</quote> to the trunk has removed
Sally's recent changes from the latest revision!</para>
-->
<para>Auf den ersten Blick sieht es gar nicht schlecht aus,
@@ -4580,7 +4580,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.pre1.5clients">
<!--
<title>Blocking Merge-Unaware Clients</title>
@@ -4650,7 +4650,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.finalword">
<!--
<title>The Final Word on Merge Tracking</title>
More information about the svnbook-dev
mailing list