view tests/test-mq-merge.out @ 5624:3da5ff2a9b11

win32: it is no longer necessary to bundle patch.exe Mercurial can use it's built-in mpatch library
author Steve Borho <steve@borho.org>
date Fri, 07 Dec 2007 18:18:11 -0600
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