Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-rename-dir-merge2 @ 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 | c95060a5391a |
children |