view tests/test-mq-merge.out @ 4685:b5bbfa18daf7

hgeditor: Use $HG to run 'hg diff' (see 849f011dbf79)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 23 Jun 2007 20:22:17 +0200
parents a210b40d0860
children
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