Git: How configure KDiff3 as merge tool and diff tool

前端 未结 7 1063
长情又很酷
长情又很酷 2020-11-28 17:25

Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I uninstalled GitExtension and install th

7条回答
  •  孤城傲影
    2020-11-28 18:02

    Just to extend the @Joseph's answer:

    After applying these commands your global .gitconfig file will have the following lines (to speed up the process you can just copy them in the file):

    [merge]
        tool = kdiff3
    [mergetool "kdiff3"]
        path = C:/Program Files/KDiff3/kdiff3.exe
        trustExitCode = false
    [diff]
        guitool = kdiff3
    [difftool "kdiff3"]
        path = C:/Program Files/KDiff3/kdiff3.exe
        trustExitCode = false
    

提交回复
热议问题