Wed, 01 Aug 2007 14:32:53 -0700 Merge with stable
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:32:53 -0700] rev 5049
Merge with stable
Wed, 01 Aug 2007 14:32:05 -0700 Update asciidoc instructions to suggest html4 for newer versions
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:32:05 -0700] rev 5048
Update asciidoc instructions to suggest html4 for newer versions
Wed, 01 Aug 2007 14:26:30 -0700 Merge with mpm
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 14:26:30 -0700] rev 5047
Merge with mpm
Wed, 01 Aug 2007 12:03:50 -0700 Automated merge with http://hg.intevation.org/mercurial/crew
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:50 -0700] rev 5046
Automated merge with http://hg.intevation.org/mercurial/crew
Wed, 01 Aug 2007 12:03:10 -0700 dirstate: improve error message on file/directory clash
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 12:03:10 -0700] rev 5045
dirstate: improve error message on file/directory clash
Wed, 01 Aug 2007 11:37:11 -0700 imerge extension and test
Brendan Cully <brendan@kublai.com> [Wed, 01 Aug 2007 11:37:11 -0700] rev 5044
imerge extension and test
(0) -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip