mercurialmergetortoisehgwinmerge

Use WinMerge as TortoiseHG Merge tool

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?

Solution

  • You can add

    winmergeu.binary=True

    as found here if winmerge can merge binary files. If it can't you'll want to configure another merge tool that can and use matters to send the binary files to that tool.