Use WinMerge as TortoiseHG Merge tool

后端 未结 2 461
一整个雨季
一整个雨季 2021-02-01 15:55

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 de         


        
2条回答
  •  故里飘歌
    2021-02-01 16:24

    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.

提交回复
热议问题