hgbook
diff en/ch01-intro.tex @ 551:f72b7e6cbe90
Snapshot.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Thu Feb 05 00:01:16 2009 -0800 (2009-02-05) |
parents | 5cd47f721686 |
children |
line diff
1.1 --- a/en/ch01-intro.tex Thu Jan 29 22:56:27 2009 -0800 1.2 +++ b/en/ch01-intro.tex Thu Feb 05 00:01:16 2009 -0800 1.3 @@ -375,8 +375,7 @@ 1.4 1.5 Prior to version 1.5, Subversion had no useful support for merges. 1.6 At the time of writing, its merge tracking capability is new, and known to be 1.7 -\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated 1.8 - and buggy}. 1.9 +\href{http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword}{complicated and buggy}. 1.10 1.11 Mercurial has a substantial performance advantage over Subversion on 1.12 every revision control operation I have benchmarked. I have measured