# HG changeset patch # User Sean Russell # Date 1219375302 14400 # Node ID 22ecadf9f4132c2e4866611ac921689f3fc029fb # Parent 231c8469a0ec551c04cf5494b8057cee5c3499ac Another obsolete SVN merge comment fixed diff -r 231c8469a0ec -r 22ecadf9f413 en/intro.tex --- 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