changeset 415:22ecadf9f413

Another obsolete SVN merge comment fixed
author Sean Russell <ser@ser1.net>
date Thu, 21 Aug 2008 23:21:42 -0400
parents 231c8469a0ec
children cd595464fea9
files en/intro.tex
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/en/intro.tex	Thu Aug 21 23:07:36 2008 -0400
+++ b/en/intro.tex	Thu Aug 21 23:21:42 2008 -0400
@@ -515,9 +515,7 @@
 As an example, Subversion is a good choice for working with frequently
 edited binary files, due to its centralised nature and support for
 file locking.  If you're averse to the command line, it currently has
-better GUI support than other free revision control tools.  However,
-its poor merging is a substantial liability for busy projects with
-overlapping development.
+better GUI support than other free revision control tools.
 
 I personally find Mercurial's properties of simplicity, performance,
 and good merge support to be a compelling combination that has served