tests/test-mq-merge.out
author Brendan Cully <brendan@kublai.com>
Thu, 23 Aug 2007 22:45:41 -0700
changeset 5223 3786ef8877d5
parent 4437 a210b40d0860
permissions -rw-r--r--
imerge: add automerge flag to attempt to batch merge all conflicts

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