git - cygwin git下的KDiff3不会调用

Question

为了与互联网上发布的许多解决方案保持一致，我安装了 KDiff3 并修改了 .gitconfig 以使用它，如下所示。尽管如此，当我在存储库中运行 git diff HEAD^ HEAD 来测试它时，我得到了默认工具执行的差异。我在 Windows7-64 上运行 cygwin git。谁能解释为什么不调用 KDiff3？

[diff]
    tool = kdiff3
[merge]
    tool = kdiff3

[difftool "kdiff3"]
    path = \"D:/Program Files (x86)/KDiff3/kdiff3.exe\"
    keepBackup = false
    trustExitCode = false

[mergetool "kdiff3"]
    path = \"D:/Program Files (x86)/KDiff3/kdiff3.exe\"
    keepBackup = false
    trustExitCode = false

Answer 1

实际上，不需要包装器脚本。如果 kdiff3.exe 不在您的路径中，您需要在 cmd 中提供完整路径，如 cmd =/cygdrive/c/apps/KDiff3/kdiff3 ...

我的.gitconfit

[diff]
    tool = kdiff3
[merge]
    tool = kdiff3
[difftool "kdiff3"]
    cmd = kdiff3 \"$(cygpath -wla $LOCAL)\" \"$(cygpath -wla $REMOTE)\"
    trustExitCode = false
[mergetool "kdiff3"]
    cmd = kdiff3 \"$(cygpath -wla $BASE)\" \"$(cygpath -wla $LOCAL)\" \"$(cygpath -wla $REMOTE)\" -o \"$(cygpath -wla $MERGED)\"
    keepBackup = false
    trustExitCode = false
[mergetool]
    prompt = false
[difftool]
    prompt = false