根据互联网上发布的许多解决方案,我已经安装了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