Mercurial > hg

view tests/test-mq-merge.out @ 7717:f9ba30cb7ee4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: expose sibling branches to templater
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 26 Jan 2009 15:52:10 +0100
parents fb32ae9c76e7
children 9a398dd53bcc
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
(working directory not at tip)
applying patcha
now at: patcha