Use WinMerge as TortoiseHG Merge tool

Question

I am trying to set up WinMerge as the Merge tool into TortoiseHG; Here is my Mercurial.ini:

; User specific Mercurial config file. ; See the hgrc man page for details.  [ui] username = Bargio <> merge = winmergeu   [extdiff] cmd.winmerge = C:\Program Files (x86)\WinMerge\WinMergeU.exe opts.winmerge = /e /x /ub /wl  [merge-tools] winmergeu.executable = C:\Program Files (x86)\WinMerge\WinMergeU.exe winmergeu.priority= 1 winmergeu.fixeol=True winmergeu.checkchanged=True winmergeu.args= /e /ub /dl other /dr local $other $local $output winmergeu.gui=False  [tortoisehg] vdiff = winmerge 

Visual diff works perfectly but when I try to merge two files, I get the following error:

tool winmergeu can't handle binary 

How can I fix it?

Answer 1

You no longer have to mess with the .ini file. As long as you have both TortoiseHG and WinMerge installed you will see it as an option in TortoiseHG Global Settings - TortoiseHG section - Three-way Merge Tool and Visual Diff Tool. It shows up as "winmergeu". Banged my head against the wall for a couple hours before I found this; I must be blind.

WinMerge 2.12.4.0 Unicode

TortoiseHg 2.5.1

Mercurial 2.3.2