tests/test-mq-merge.out
author Cédric Duval <cedricduval@free.fr>
Sun, 21 Jun 2009 16:32:00 +0200
changeset 8871 20a25042fadc
parent 8433 9a398dd53bcc
child 9110 561ff8d9e4f0
permissions -rw-r--r--
extensions: move extensions listing functions from mercurial.help Includes some small fix-ups to comments in enabled() and disabled().

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
applying patcha
now at: patcha