Git: How configure KDiff3 as merge tool and diff tool

前端 未结 7 1084
长情又很酷
长情又很酷 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条回答
  •  慢半拍i
    慢半拍i (楼主)
    2020-11-28 17:55

    For Mac users

    Here is @Joseph's accepted answer, but with the default Mac install path location of kdiff3

    (Note that you can copy and paste this and run it in one go)

    git config --global --add merge.tool kdiff3 
    git config --global --add mergetool.kdiff3.path  "/Applications/kdiff3.app/Contents/MacOS/kdiff3" 
    git config --global --add mergetool.kdiff3.trustExitCode false
    
    git config --global --add diff.guitool kdiff3
    git config --global --add difftool.kdiff3.path "/Applications/kdiff3.app/Contents/MacOS/kdiff3"
    git config --global --add difftool.kdiff3.trustExitCode false
    

提交回复
热议问题