[RobAtticus]

Using "hg help merge-tools" it describes some different merge tool settings that you might fine helpful. For example if you want it to merge all files it can, and mark the ones it can't fully merge you can try "internal:merge".

To set it for your user globally, in your .hgrc put "merge=internal:merge" under [ui].

[StavrosK]

Fantastic, thank you.