How to get mercurial to emit base revision of conflicted file as well as modified version?

Question

I\'m trying to merge two branches together using mercurial and there are some conflicts. When working in Subversion, merge conflicts would result in the conflicted file bein

Answer 1

We have a built-in merge tool for this called internal:dump. So with

[ui]
merge = internal:dump

you will be brought back to the good old Subversion-days, or something close to it.