[svnbook] r4907 committed - Translation: svn.ref.svn.c.resolve

[svnbook at googlecode.com]

Revision: 4907
Author:   jmfelderhoff at gmx.eu
Date:     Mon Nov 10 17:13:02 2014 UTC
Log:      Translation: svn.ref.svn.c.resolve

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

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

=======================================
--- /branches/1.8/de/book/ref-svn.xml	Mon Nov 10 17:10:49 2014 UTC
+++ /branches/1.8/de/book/ref-svn.xml	Mon Nov 10 17:13:02 2014 UTC
@@ -8556,7 +8556,8 @@
  </screen>
        </informalexample>
      </refsect1>
-
+
+    <!-- ===============================================================  
-->
      <refsect1>
  <!--
        <title>Examples</title>
@@ -8581,21 +8582,21 @@
  Updating '.': <!--
  Conflict discovered in 'foo.c'.
  Select: (p) postpone, (df) diff-full, (e) edit,
-    (mc) mine-conflict, (tc) theirs-conflict,
-    (s) show all options: p
+        (mc) mine-conflict, (tc) theirs-conflict,
+        (s) show all options: p
  C    foo.c
  Updated to revision 5.
  Summary of conflicts:
-Text conflicts: 1
+  Text conflicts: 1
  -->
  Konflikt in »foo.c« entdeckt.
  Auswahl: (p) zurückstellen, (df) voller Diff, (e) editieren,
-     (mc) eigene konfliktbehaftete Datei, (tc) fremde konfliktbehaftete  
Datei,
-     (s) alle Optionen anzeigen: p
+         (mc) eigene konfliktbehaftete Datei, (tc) fremde  
konfliktbehaftete Datei,
+         (s) alle Optionen anzeigen: p
  C    foo.c
  Aktualisiert zu Revision 5.
  Konfliktübersicht:
-Textkonflikte: 1
+  Textkonflikte: 1
  $ svn resolve --accept mine-full foo.c <!--
  Resolved conflicted state of 'foo.c'
  -->