[svnbook] r5163 committed - trunk/en/book/ch02-basic-usage.xml
lyalyakin at users.sourceforge.net
lyalyakin at users.sourceforge.net
Thu Jun 2 09:59:44 CDT 2016
Revision: 5163
http://sourceforge.net/p/svnbook/source/5163
Author: lyalyakin
Date: 2016-06-02 14:59:44 +0000 (Thu, 02 Jun 2016)
Log Message:
-----------
Issue #266.
* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.pending): Fixed closing </para> tag.
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-06-01 11:24:46 UTC (rev 5162)
+++ trunk/en/book/ch02-basic-usage.xml 2016-06-02 14:59:44 UTC (rev 5163)
@@ -1685,8 +1685,7 @@
tool allows you to postpone conflict resolution for certain
conflicts, but resolve other confilcts. Therefore, you can
postpone conflict resolution area-by-area, not just on
- file-to-file basis.
- </para>
+ file-to-file basis.</para>
<para>The <computeroutput>C</computeroutput>
(for <quote>Conflicted</quote>) means that the changes from the
More information about the svnbook-dev
mailing list