[svnbook] r5148 committed - trunk/en/book/ch02-basic-usage.xml

[lyalyakin at users.sourceforge.net]

Revision: 5148
          http://sourceforge.net/p/svnbook/source/5148
Author:   lyalyakin
Date:     2016-05-30 12:59:07 +0000 (Mon, 30 May 2016)
Log Message:
-----------
Issue #266.

* en/book/ch02-basic-usage.xml
  (svn.tour.cycle.resolve.diff): Update other <screen> outputs for
  `svn update` with conflicts to match SVN 1.8.

Modified Paths:
--------------
    trunk/en/book/ch02-basic-usage.xml

Modified: trunk/en/book/ch02-basic-usage.xml
===================================================================
--- trunk/en/book/ch02-basic-usage.xml	2016-05-28 20:47:03 UTC (rev 5147)
+++ trunk/en/book/ch02-basic-usage.xml	2016-05-30 12:59:07 UTC (rev 5148)
@@ -1736,8 +1736,8 @@
 $ svn update
 Updating '.':
 Conflict discovered in 'sandwich.txt'.
-Select: (p) postpone, (df) diff-full, (e) edit,
-        (mc) mine-conflict, (tc) theirs-conflict,
+Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
+        (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options: p
 C    sandwich.txt
 Updated to revision 2.
@@ -1971,8 +1971,8 @@
 $ svn update
 Updating '.':
 Conflict discovered in 'sandwich.txt'.
-Select: (p) postpone, (df) diff-full, (e) edit,
-        (mc) mine-conflict, (tc) theirs-conflict,
+Select: (p) postpone, (df) show diff, (e) edit file, (m) merge,
+        (mc) my side of conflict, (tc) their side of conflict,
         (s) show all options: p
 C    sandwich.txt
 Updated to revision 2.