Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-mq-merge.out @ 4333:4f721e96f1de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add test for issue 529 - "mq aborts when merging patch deleting files".
author Patrick Mezard <pmezard@gmail.com>
date Sat, 07 Apr 2007 19:42:26 +0100
parents
children a210b40d0860
comparison
equal deleted inserted replaced
4332:4e5e1638b165 4333:4f721e96f1de
1 adding a
2 adding b
3 copy .hg/patches to .hg/patches.1
4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
5 M b
6 a
7 b
8 merging with queue at: .hg/patches.1
9 applying rm_a
10 Now at: rm_a
11 b