Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-clone-r.out @ 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 | dc1bbc456b96 |
| children | ced2d3620f95 |
comparison
equal
deleted
inserted
replaced
| 1580:4737b36e324e | 1581:db10b7114de0 |
|---|