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

lyalyakin at users.sourceforge.net lyalyakin at users.sourceforge.net
Mon May 30 14:58:22 CDT 2016


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

* en/book/ch02-basic-usage.xml
  (svn.tour.cycle.resolve.resolve): Let's tell that the new merge tool
  is a *file* merge tool.

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 15:23:14 UTC (rev 5149)
+++ trunk/en/book/ch02-basic-usage.xml	2016-05-30 19:58:22 UTC (rev 5150)
@@ -1458,7 +1458,7 @@
         <varlistentry>
           <term><computeroutput>(m)  merge</computeroutput></term>
           <listitem>
-            <para>Launch an internal merge tool to perform the
+            <para>Launch an internal file merge tool to perform the
               conflict resolution.  The option is available starting
               with Subversion 1.8.</para>
           </listitem>
@@ -1566,8 +1566,8 @@
             <secondary>resolution</secondary>
             <tertiary>interactive</tertiary>
           </indexterm>The main way to resolve conflicts interactively
-          is to use an internal merge tool.  The tool asks you what to
-          do with each conflicting change and allows you to
+          is to use an internal file merge tool.  The tool asks you
+          what to do with each conflicting change and allows you to
           selectively merge and edit changes.  However, there are
           several other different ways to resolve conflicts
           interactively—two of them allow you to selectively





More information about the svnbook-dev mailing list