Mercurial > hgbook
changeset 418:1d277d6aa187
Merge
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Tue, 26 Aug 2008 14:14:24 -0700 |
| parents | f3bef43b8ca1 (diff) 635d7c0fcac3 (current diff) |
| children | 97e929385442 f79542a53cb2 701cc7f8aee3 |
| files | en/intro.tex en/tour-basic.tex |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/en/intro.tex Tue Aug 26 14:06:41 2008 -0700 +++ b/en/intro.tex Tue Aug 26 14:14:24 2008 -0700 @@ -519,10 +519,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. +file locking. I personally find Mercurial's properties of simplicity, performance, and good merge support to be a compelling combination that has served
--- a/en/tour-basic.tex Tue Aug 26 14:06:41 2008 -0700 +++ b/en/tour-basic.tex Tue Aug 26 14:14:24 2008 -0700 @@ -56,7 +56,9 @@ \subsection{Solaris} -XXX. +SunFreeWare, at \url{http://www.sunfreeware.com}, is a good source for a +large number of pre-built Solaris packages for 32 and 64 bit Intel and +Sparc architectures, including current versions of Mercurial. \subsection{Mac OS X}