view tests/test-mq-merge.out @ 6450:27d59ce043a1

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 02 Apr 2008 21:46:30 +0200
parents 4b0c9c674707
children f18f14bae172
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
created new head
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b
Patch queue now empty