Mercurial > hg-stable

view tests/test-mq-merge.out @ 9106:7705d184faa1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: use all caps for 'note:' in help string The diff, export, log, and status commands write it as 'NOTE:'.
author Martin Geisler <mg@lazybytes.net>
date Thu, 09 Jul 2009 22:52:39 +0200
parents 9a398dd53bcc
children 561ff8d9e4f0
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
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