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