##// END OF EJS Templates
Add notes about configuring a merge program
Add notes about configuring a merge program

File last commit:

r4333:4f721e96 default
r4386:1386a9cf default
Show More
test-mq-merge.out
11 lines | 195 B | text/plain | TextLexer
/ tests / test-mq-merge.out
Patrick Mezard
Add test for issue 529 - "mq aborts when merging patch deleting files".
r4333 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
a
b
merging with queue at: .hg/patches.1
applying rm_a
Now at: rm_a
b