tests/test-mq-merge.out
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 11 Jan 2008 16:51:54 -0800
changeset 5848 e90a7a3c28a4
parent 4437 a210b40d0860
child 6336 4b0c9c674707
permissions -rw-r--r--
Merge with mpm

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