view tests/test-mq-merge.out @ 6188:3b0c2b71e0d7

debugancestor: use *args instead of *opts, to not confuse with option dicts.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Feb 2008 01:14:37 +0100
parents a210b40d0860
children 4b0c9c674707
line wrap: on
line source

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