Mercurial > hg > mercurial-crew-with-dirclash
log tests/test-up-local-change.out @ 1581:db10b7114de0
age | author | description |
---|---|---|
Wed, 14 Dec 2005 22:19:03 -0600 | Benoit Boissinot | abort when merging two heads and repository has local changes |
Mon, 26 Sep 2005 16:52:47 -0700 | Matt Mackall | Repair ancestor logic, fix up test cases |
Sat, 20 Aug 2005 13:08:07 -0700 | mpm | Merge with jeffpc |