How can I make WinMerge my git mergetool?

后端 未结 12 1726
既然无缘
既然无缘 2020-12-02 06:48

I\'m trying to integrate WinMerge with Git as I\'ve seen others done before on Windows 7 Ultimate.

I\'ve followed the following steps, but an error continues to show

12条回答
  •  时光说笑
    2020-12-02 07:12

    Here's mine (in %userprofile%\.gitconfig, or ~/.gitconfig on *nix), no wrapper (Win 7 Home Pro):

    [diff]
        tool = winmerge
    [difftool "winmerge"]
        cmd = c:/path/to/winmergeu.exe -e -u -x -wl -wr -dl "base" -dr "mine" \"$LOCAL\" \"$REMOTE\"
    

提交回复
热议问题