[svnbook] r5152 committed - trunk/en/book/ch02-basic-usage.xml
lyalyakin at users.sourceforge.net
lyalyakin at users.sourceforge.net
Mon May 30 15:05:40 CDT 2016
Revision: 5152
http://sourceforge.net/p/svnbook/source/5152
Author: lyalyakin
Date: 2016-05-30 20:05:40 +0000 (Mon, 30 May 2016)
Log Message:
-----------
Issue #266.
* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): minor fix.
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:05:18 UTC (rev 5151)
+++ trunk/en/book/ch02-basic-usage.xml 2016-05-30 20:05:40 UTC (rev 5152)
@@ -1576,7 +1576,7 @@
move along. Internal merge tool combines all of the
available ways to resolve conflicts.</para>
- <para>You've already reviewed the conflicting changes, so its
+ <para>You've already reviewed the conflicting changes, so it's
now time to resolve the conflicts. The first command that
should help you is the <quote>merge</quote> command
(<userinput>m</userinput>) which is available starting with
More information about the svnbook-dev
mailing list