Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-mq-merge.out @ 4815:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 13:34:18 -0500 |
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