Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-merge.out @ 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 | a210b40d0860 |
children |
line wrap: on
line source
adding a adding b copy .hg/patches to .hg/patches.1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved M b a b merging with queue at: .hg/patches.1 applying rm_a Now at: rm_a b Patch queue now empty