Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge5 @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Dec 2005 22:19:03 -0600 |
parents | 0902ffece4b4 |
children | 7544700fd931 |
comparison
equal
deleted
inserted
replaced
1580:4737b36e324e | 1581:db10b7114de0 |
---|