How can I make WinMerge my git mergetool?

后端 未结 12 1714
既然无缘
既然无缘 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:07

    This is easier to do and is what worked for me:

    git config --global diff.tool winmerge
    
    git config --replace --global difftool.winmerge.cmd "\"C:\path to winmerge\WinMergeU.exe\" -e -u -dl \"Base\" -dr \"Mine\" $LOCAL $REMOTE"
    
    git config --global difftool.prompt false
    

提交回复
热议问题