tests/test-mq-merge.out
author Matt Mackall <mpm@selenic.com>
Thu, 27 Dec 2007 22:27:43 -0600
changeset 5701 32c2832682a9
parent 4437 a210b40d0860
child 6336 4b0c9c674707
permissions -rw-r--r--
add --debug to test-merge-types

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