How to make hg merge, hg resolve use FileMerge

2009-04-22 16:39:56 -08:00

Put this in your ~/.hgrc file:

filemerge.args=$other $local -ancestor $base -merge $output

(Based on the original description of and Matt Mackall’s comment on a Mercurial bug about merging.)

One Response to “How to make hg merge, hg resolve use FileMerge”

  1. Richard Says:

    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).

Leave a Reply

Do not delete the second sentence.