[svnbook] r4541 committed - Translation: Merges and Moves

svnbook at googlecode.com svnbook at googlecode.com
Thu Sep 5 15:17:35 CDT 2013


Revision: 4541
Author:   jmfelderhoff at gmx.eu
Date:     Thu Sep  5 20:17:23 2013 UTC
Log:      Translation: Merges and Moves

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

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

=======================================
--- /branches/1.6/de/book/ch04-branching-and-merging.xml	Thu Sep  5  
19:58:31 2013 UTC
+++ /branches/1.6/de/book/ch04-branching-and-merging.xml	Thu Sep  5  
20:17:23 2013 UTC
@@ -4513,7 +4513,8 @@
          zusammenzuführen:</para>

  <!--
-      <screen>
+      <informalexample>
+        <screen>
  $ cd calc/trunk

  $ svn merge - -reintegrate  
http://svn.example.com/repos/calc/branches/my-calc-branch
@@ -4521,9 +4522,11 @@
  D   integer.c
  A   whole.c
  U   .
-      </screen>
+</screen>
+      </informalexample>
  -->
-      <screen>
+      <informalexample>
+        <screen>
  $ cd calc/trunk

  $ svn merge --reintegrate  
http://svn.example.com/repos/calc/branches/my-calc-branch
@@ -4531,7 +4534,8 @@
  D   integer.c
  A   whole.c
  U   .
-      </screen>
+</screen>
+      </informalexample>

  <!--
        <para>This doesn't look so bad at first glance, but it's also


More information about the svnbook-dev mailing list