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 5044
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 5043
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 5042
imerge extension and test
Wed, 01 Aug 2007 09:57:05 -0700 localrepository: allow rawcommit to commit with an empty message
Bryan O'Sullivan <bos@serpentine.com> [Wed, 01 Aug 2007 09:57:05 -0700] rev 5041
localrepository: allow rawcommit to commit with an empty message
(0) -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 tip