[svnbook] r5137 committed - trunk/en/book/ch00-preface.xml

[lyalyakin at users.sourceforge.net]

Revision: 5137
          http://sourceforge.net/p/svnbook/source/5137
Author:   lyalyakin
Date:     2016-05-26 18:29:51 +0000 (Thu, 26 May 2016)
Log Message:
-----------
Starting the read-thru of SVNBook 1.8.

* en/book/ch00-preface.xml
  (svn.intro.whatsnew): Let's mention interactive conflict
  resolution that's new in Subversion 1.8.

Modified Paths:
--------------
    trunk/en/book/ch00-preface.xml

Modified: trunk/en/book/ch00-preface.xml
===================================================================
--- trunk/en/book/ch00-preface.xml	2016-04-15 00:32:21 UTC (rev 5136)
+++ trunk/en/book/ch00-preface.xml	2016-05-26 18:29:51 UTC (rev 5137)
@@ -638,10 +638,11 @@
               repository to dictate default values for automatic
               property settings and ignorable file patterns, bringing
               consistency across the user base of that repository in a
-              way which previously had to be managed socially.  As
-              always, Subversion 1.8 includes many additional
-              features, defect fixes, and improvements in behavior and
-              performance.</para>
+              way which previously had to be managed socially.  There
+              is also a new built-in command-line file merge tool for
+              interactive conflict resolution.  As always, Subversion
+              1.8 includes many additional features, defect fixes, and
+              improvements in behavior and performance.</para>
           </listitem>
         </varlistentry>