version control - Completely manual Mercurial merge

Question

Is there any way to take complete manual control over the merge process in Mercurial?

I want to be able to choose direction of file-merge, even for files without conflicts. Is that possible?

Answer 1

Turn "pre-merge" off in your merge configuration. Then everything counts as a conflict and you can pick "left" or "right" for each and every file change.

[merge-tools]
mymergetool.premerge = False

from MergeToolConfiguration on the Mercurial wiki.