How to make hg merge, hg resolve use FileMerge
Put this in your ~/.hgrc file:
[merge-tools] filemerge.executable=opendiff filemerge.args=$other $local -ancestor $base -merge $output filemerge.gui=True
(Based on the original description of and Matt Mackall’s comment on a Mercurial bug about merging.)
March 24th, 2010 at 17:33:12
At least on Snow Leopard with Mercurial 1.4.3, ‘opendiff’ quits immediately so this will cause Mercurial to randomly resolve merge conflicts. So DON’T PUT THIS IN YOUR .HGRC FILE IF YOU DON’T WANT LOST CHANGES (or at least, please test with something that’s not important, lest you lose your work like I did).