Git无法打开difftool？

Question

我已经安装了git，p4merge和源码树。我只想使用p4merge来做比较和合并。在我打开资源树之前，git difftool曾经打开过p4merge。但现在，它只是在命令行上显示差异。为什么会发生这种情况?我如何修复它？

我将sourcetree设置为使用sourcetree中的p4merge，但这不起作用。删除资源树配置也不起作用(我打开新的命令提示符，然后重试)。

下面是我的全局.gitconfig文件：

[user]
    name = Jason Taylor
    email = jt@awesome.com
[core]
    autocrlf = true
    editor = 'C:\\notepad-plus\\notepad++.exe' -multiInst -notabbar -nosession -noPlugin
[color]
    ui = true
[gui]
    recentrepo = C:/myrepos/repo1
    recentrepo = C:/myrepos/repo2
[diff]
    tool = p4merge
[difftool "p4merge"]
    path = C:\\Program Files\\Perforce\\p4merge.exe
[difftool]
    prompt = false
[merge]
    tool = p4merge
[mergetool "p4merge"]
    path = C:\\Program Files\\Perforce\\p4merge.exe
[mergetool]
    prompt = false
[credential]
    helper = store

[difftool "sourcetree"]
    cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$LOCAL\" \"$REMOTE\"
[mergetool "sourcetree"]
    cmd = 'C:/Program Files/Perforce/p4merge.exe' \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
    trustExitCode = true

Answer 1

作为替代described here

将p4merge设置为

• 确保p4merge is in
• difftool is in your PATH

如果仍然失败，在diff没有打开p4merge的存储库中执行git config -l --show-origin，并检查设置是否被覆盖，可能是被本地Git配置覆盖。