Mercurial > hg > mercurial-crew-with-dirclash

log tests/test-merge1 @ 4337:23068518deca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -10 -7 tip
age author description
Tue, 26 Dec 2006 14:17:48 +0100 Thomas Arendsen Hein Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Wed, 11 Oct 2006 16:35:09 +0200 Benoit Boissinot fix traceback of extdiff after a merge
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.
Mon, 13 Mar 2006 13:05:41 +0100 Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Wed, 14 Dec 2005 22:19:03 -0600 Benoit Boissinot abort when merging two heads and repository has local changes
Tue, 13 Sep 2005 18:38:27 -0500 mpm Fix bug with co -C across branches, update tests
Sat, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS
less more | (0) -10 -7 tip