[svnbook] r4540 committed - Translation: Noticing or Ignoring Ancestry
svnbook at googlecode.com
svnbook at googlecode.com
Thu Sep 5 14:58:46 CDT 2013
Revision: 4540
Author: jmfelderhoff at gmx.eu
Date: Thu Sep 5 19:58:31 2013 UTC
Log: Translation: Noticing or Ignoring Ancestry
http://code.google.com/p/svnbook/source/detail?r=4540
Modified:
/branches/1.6/de/book/ch04-branching-and-merging.xml
=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml Sun Aug 18
20:04:34 2013 UTC
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml Thu Sep 5
19:58:31 2013 UTC
@@ -4370,10 +4370,12 @@
löschen und dann die neue hinzuzufügen; die Ausgabe wird eine
Löschung gefolgt von einer Hinzufügung anzeigen:</para>
- <screen>
+ <informalexample>
+ <screen>
D foo.c
A foo.c
- </screen>
+</screen>
+ </informalexample>
<!--
<para>Most merges involve comparing trees that are ancestrally
@@ -4391,7 +4393,7 @@
only, ignoring any relations between files and directories.
Add the <option>- -ignore-ancestry</option> option to your
<command>merge</command> command, and it will behave just
- like <command>svn diff</command>. (And conversely, the
+ like <command>svn diff</command>. (And conversely, the
<option>- -notice-ancestry</option> option will cause
<command>svn diff</command> to behave like the
<command>svn merge</command> command.)</para>
@@ -4421,7 +4423,7 @@
</sect2>
- <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- ===============================================================
-->
<sect2 id="svn.branchmerge.advanced.moves">
<!--
<title>Merges and Moves</title>
More information about the svnbook-dev
mailing list