Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-merge1 @ 2710:ca97be5babf8
age | author | description |
---|---|---|
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 |