tests/test-mq-merge.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 08 May 2007 11:51:25 -0700
changeset 4419 59ddd43f609f
parent 4333 4f721e96f1de
child 4437 a210b40d0860
permissions -rw-r--r--
contrib/hgsh: Check for .hg/store as well as .hg/data. This is required by the new repository layout.

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