How can I make WinMerge my git mergetool?

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

    After hassling with this for over an hour, I installed tortoisegit and so far it's giving me exactly what I want.

    Settings of Winmerge for Tortoise git are described in http://thoai-nguyen.blogspot.com.au/2012/03/setup-tortoise-git-and-winmerge.html

提交回复
热议问题