使用WinMerge作为TortoiseHG合并工具 [英] Use WinMerge as TortoiseHG Merge tool

问题描述

我正在尝试将WinMerge设置为TortoiseHG的合并工具； 这是我的Mercurial.ini:

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可以正常工作，但是当我尝试合并两个文件时，出现以下错误:

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

tool winmergeu can't handle binary

我该如何解决?

推荐答案

您可以添加

winmergeu.binary=True

在此处中找到，如果winmerge可以合并二进制文件.如果不能，则需要配置另一个合并工具，该合并工具可以并使用事务将二进制文件发送到该工具.

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.

这篇关于使用WinMerge作为TortoiseHG合并工具的文章就介绍到这了，希望我们推荐的答案对大家有所帮助，也希望大家多多支持IT屋！