[svnbook] r5154 committed - trunk/en/book/ch02-basic-usage.xml
lyalyakin at users.sourceforge.net
lyalyakin at users.sourceforge.net
Mon May 30 15:29:39 CDT 2016
Revision: 5154
http://sourceforge.net/p/svnbook/source/5154
Author: lyalyakin
Date: 2016-05-30 20:29:39 +0000 (Mon, 30 May 2016)
Log Message:
-----------
Issue #266.
* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Using the internal file merge tool
you can resolve the conflicts area-by-area.
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 20:16:13 UTC (rev 5153)
+++ trunk/en/book/ch02-basic-usage.xml 2016-05-30 20:29:39 UTC (rev 5154)
@@ -1581,7 +1581,8 @@
should help you is the <quote>merge</quote> command
(<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:
+ areas and allows you to choose from a number of options to
+ resolve the conflicts area-by-area:
</para>
<informalexample>
More information about the svnbook-dev
mailing list