tests/test-mq-merge.out
author Bryan O'Sullivan <bos@serpentine.com>
Mon, 27 Aug 2007 13:38:34 -0700
changeset 5257 fd371f99f20b
parent 4437 a210b40d0860
child 6336 4b0c9c674707
permissions -rw-r--r--
Automated merge with http://hg.intevation.org/mercurial/crew

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