##// END OF EJS Templates
extdiff: merge node and working dir snapshot modes
extdiff: merge node and working dir snapshot modes

File last commit:

r7627:fb32ae9c default
r8064:5c7bc1ae default
Show More
test-mq-merge.out
24 lines | 522 B | text/plain | TextLexer
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