hgbook
changeset 316:22ecadf9f413
Another obsolete SVN merge comment fixed
author | Sean Russell <ser@ser1.net> |
---|---|
date | Thu Aug 21 23:21:42 2008 -0400 (2008-08-21) |
parents | 231c8469a0ec |
children | cd595464fea9 |
files | en/intro.tex |
line diff
1.1 --- a/en/intro.tex Thu Aug 21 23:07:36 2008 -0400 1.2 +++ b/en/intro.tex Thu Aug 21 23:21:42 2008 -0400 1.3 @@ -515,9 +515,7 @@ 1.4 As an example, Subversion is a good choice for working with frequently 1.5 edited binary files, due to its centralised nature and support for 1.6 file locking. If you're averse to the command line, it currently has 1.7 -better GUI support than other free revision control tools. However, 1.8 -its poor merging is a substantial liability for busy projects with 1.9 -overlapping development. 1.10 +better GUI support than other free revision control tools. 1.11 1.12 I personally find Mercurial's properties of simplicity, performance, 1.13 and good merge support to be a compelling combination that has served