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

lyalyakin at users.sourceforge.net lyalyakin at users.sourceforge.net
Mon May 30 15:05:18 CDT 2016


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

* en/book/ch02-basic-usage.xml
  (svn.tour.cycle.resolve.resolve): Tell that the new internal file
  merge is available starting with 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-30 19:58:22 UTC (rev 5150)
+++ trunk/en/book/ch02-basic-usage.xml	2016-05-30 20:05:18 UTC (rev 5151)
@@ -1579,7 +1579,8 @@
         <para>You've already reviewed the conflicting changes, so its
           now time to resolve the conflicts.  The first command that
           should help you is the <quote>merge</quote> command
-          (<userinput>m</userinput>) which displays the conflicting
+          (<userinput>m</userinput>) which is available starting with
+          Subversion 1.8.  The command displays the conflicting
           lines and allows you to choose from a number of options:
          </para>
 




More information about the svnbook-dev mailing list