Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge-revert @ 5204:6a1d2dd96b8e
abort when adding a file in merged state
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 21 Aug 2007 02:02:08 +0200 |
parents | 46280c004f22 |
children |
comparison
equal
deleted
inserted
replaced
5203:ce4e67533723 | 5204:6a1d2dd96b8e |
---|