[svnbook] r4530 committed - Translation: More on Merge Conflicts

[svnbook at googlecode.com]

Revision: 4530
Author:   jmfelderhoff at gmx.eu
Date:     Tue Aug  6 08:32:45 2013
Log:      Translation: More on Merge Conflicts

http://code.google.com/p/svnbook/source/detail?r=4530

Modified:
  /branches/1.6/de/book/ch04-branching-and-merging.xml

=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml	Tue Aug  6  
08:24:46 2013
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml	Tue Aug  6  
08:32:45 2013
@@ -3574,8 +3574,9 @@
          targets</quote> beschweren:</para>

  <!--
-      <screen>
-$ svn merge -r 1288:1351 http://svn.example.com/repos/branch
+      <informalexample>
+        <screen>
+$ svn merge -r 1288:1351 http://svn.example.com/myrepos/branch
  U    foo.c
  U    bar.c
  Skipped missing target: 'baz.c'
@@ -3584,11 +3585,14 @@

  Conflict discovered in 'glorb.h'.
  Select: (p) postpone, (df) diff-full, (e) edit,
-        (h) help for more options:
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options:
  </screen>
+      </informalexample>
  -->
-      <screen>
-$ svn merge -r 1288:1351 http://svn.example.com/repos/branch
+      <informalexample>
+        <screen>
+$ svn merge -r 1288:1351 http://svn.example.com/myrepos/branch
  U    foo.c
  U    bar.c
  Fehlendes Ziel: »baz.c« übersprungen.
@@ -3597,8 +3601,10 @@

  Konflikt in »glorb.h« entdeckt.
  Auswahl: (p) zurückstellen, (df) voller Diff, (e) editieren,
-        (h) Hilfe für weitere Optionen:
+         (mc) eigene konfliktbehaftete Datei, (tc) fremde  
konfliktbehaftete Datei
+         (s) alle Optionen anzeigen:
  </screen>
+      </informalexample>

  <!--
        <para>In the previous example, it might be the case that
@@ -3655,15 +3661,15 @@

  <!--
        <para>Another small difference between <command>svn
-          update</command> and <command>svn merge</command> is the
-        names of the full-text files created when a conflict
-        happens.  In <xref linkend="svn.tour.cycle.resolve"/>, we saw
-        that an update produces files named
+        update</command> and <command>svn merge</command> is the names
+        of the full-text files created when a conflict happens.  In
+        <xref linkend="svn.tour.cycle.resolve"/>, we saw that an
+        update produces files named
          <filename>filename.mine</filename>,
          <filename>filename.rOLDREV</filename>, and
          <filename>filename.rNEWREV</filename>.  When <command>svn
-          merge</command> produces a conflict, though, it creates
-        three files named <filename>filename.working</filename>,
+        merge</command> produces a conflict, though, it creates three
+        files named <filename>filename.working</filename>,
          <filename>filename.left</filename>, and
          <filename>filename.right</filename>.  In this case, the
          terms <quote>left</quote> and <quote>right</quote> are
@@ -3674,7 +3680,7 @@
          merge.</para>
  -->
        <para>Ein weiterer kleiner Unterschied zwischen <command>svn
-          update</command> und <command>svn merge</command> sind die
+        update</command> und <command>svn merge</command> sind die
          Namen der erzeugten Textdateien, falls ein Konflikt entsteht.
          In <xref linkend="svn.tour.cycle.resolve"/> sahen wir, dass
          bei einer Aktualisierung die Dateien namens
@@ -3696,7 +3702,7 @@

      </sect2>

-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+    <!-- ===============================================================  
-->
      <sect2 id="svn.branchmerge.advanced.blockchanges">
  <!--
        <title>Blocking Changes</title>