##// END OF EJS Templates
merge with hg-stable
merge with hg-stable

File last commit:

r6336:4b0c9c67 default
r6438:a60b711c merge default
Show More
test-mq-merge.out
13 lines | 234 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