[svnbook] r4895 committed - Translation: Added missing example for the "--ignore-ancestry" option ...

[svnbook at googlecode.com]

Revision: 4895
Author:   jmfelderhoff at gmx.eu
Date:     Wed Nov  5 08:42:22 2014 UTC
Log:      Translation: Added missing example for the "--ignore-ancestry"  
option to svn.ref.svn.c.merge.

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

Modified:
  /branches/1.8/de/book/ref-svn.xml

=======================================
--- /branches/1.8/de/book/ref-svn.xml	Tue Nov  4 21:34:30 2014 UTC
+++ /branches/1.8/de/book/ref-svn.xml	Wed Nov  5 08:42:22 2014 UTC
@@ -6315,6 +6315,24 @@
  </screen>
      </informalexample>

+<!--
+    <para>Merge the differences between two unrelated branches
+      into a third branch:</para>
+-->
+    <para>Die Unterschiede zwischen zwei nicht verknüpften Zweigen in
+      einem dritten Zweig zusammenführen.</para>
+
+    <informalexample>
+      <screen>
+$ svn merge ^/vendor-drop/vendor-1.0 ^/vendor-drop/vendor-1.1 \
+            trunk --ignore-ancestry <!--
+- - - Merging differences between repository URLs into 'trunk':
+-->
+-- Zusammenführen der Unterschiede zwischen Projektarchiv-URLs in »trunk«:
+U    trunk/draw/draw.py
+</screen>
+    </informalexample>
+
      </refsect1>
    </refentry>