I don’t like it when Mercurial opens vimdiff or other external tools during merges. So I added this to my hgrc:
[ui]
merge = internal:merge
I don’t like it when Mercurial opens vimdiff or other external tools during merges. So I added this to my hgrc:
[ui]
merge = internal:merge