
[difftool "kdiff3"] path = /Applications/kdiff3.app/Contents/MacOS/kdiff3 trustExitCode = false [difftool] prompt = false [diff] tool = kdiff3 [mergetool "kdiff3"] path = /Applications/kdiff3.app/Contents/MacOS/kdiff3 trustExitCode = false [mergetool] keepBackup = false [merge] tool = kdiff3 我在 macOS Montery, ~/.gitconfig 里面设置了如上的 diff & mergetool 为 kdiff3 ,但是为什么我输入 git difftool 或者 git mergetool 此时,我正在 merge 文件。弹不出来 kdiff3 的界面呢?