view tests/test-mq-merge.out @ 7339:d11473955d30

hgweb: update tests for paper style

diff -r ca03debb3dcd -r 4e1e6aee37e8 tests/test-hgweb-commands.out
Binary file tests/test-hgweb-commands.out has changed

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