view tests/test-mq-merge.out @ 6116:e27f39865d7e

keyword: add test for patch.diff monkey
author Christian Ebert <blacktrash@gmx.net>
date Fri, 15 Feb 2008 18:36:49 +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