[svnbook] r5144 committed - trunk/en/book/ch02-basic-usage.xml
lyalyakin at users.sourceforge.net
lyalyakin at users.sourceforge.net
Fri May 27 06:49:32 CDT 2016
Revision: 5144
http://sourceforge.net/p/svnbook/source/5144
Author: lyalyakin
Date: 2016-05-27 11:49:32 +0000 (Fri, 27 May 2016)
Log Message:
-----------
Issue #266.
* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.diff): Update <screen> output 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-27 11:21:26 UTC (rev 5143)
+++ trunk/en/book/ch02-basic-usage.xml 2016-05-27 11:49:32 UTC (rev 5144)
@@ -1515,8 +1515,8 @@
<informalexample>
<screen>
…
-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: df
--- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007
+++ .svn/tmp/tempfile.32.tmp Tue Dec 11 21:34:33 2007
More information about the svnbook-dev
mailing list