[svnbook] r5592 committed - trunk/en/book/ch02-basic-usage.xml
richardcavell at users.sourceforge.net
richardcavell at users.sourceforge.net
Thu Jan 18 09:07:30 CST 2018
Revision: 5592
http://sourceforge.net/p/svnbook/source/5592
Author: richardcavell
Date: 2018-01-18 15:07:30 +0000 (Thu, 18 Jan 2018)
Log Message:
-----------
Fix typo in chapter 2
"confilcts" -> "conflicts"
Modified Paths:
--------------
trunk/en/book/ch02-basic-usage.xml
Modified: trunk/en/book/ch02-basic-usage.xml
===================================================================
--- trunk/en/book/ch02-basic-usage.xml 2018-01-18 13:02:24 UTC (rev 5591)
+++ trunk/en/book/ch02-basic-usage.xml 2018-01-18 15:07:30 UTC (rev 5592)
@@ -1678,7 +1678,7 @@
<para>Beginning with Subversion 1.8, an internal file merge
tool allows you to postpone conflict resolution for certain
- conflicts, but resolve other confilcts. Therefore, you can
+ conflicts, but resolve other conflicts. Therefore, you can
postpone conflict resolution area-by-area, not just on
file-to-file basis.</para>
More information about the svnbook-dev
mailing list