tests/test-mq-merge.out
author Jason Orendorff <jorendorff@mozilla.com>
Thu, 12 Jun 2008 07:38:15 -0500
changeset 6668 034f444902d9
parent 6628 f18f14bae172
child 7627 fb32ae9c76e7
permissions -rw-r--r--
mq: qdiff: support all diffopts

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

% init t2
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% create the reference queue
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% merge
merging with queue at refqueue
(working directory not at tip)
applying patcha
Now at: patcha