Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge1 @ 3833:63f8f74ac4a8
age | author | description |
---|---|---|
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 |
Sat, 30 Jul 2005 08:35:29 -0800 | mpm | Merge with TAH |