为什么我的Git mergetool配置不起作用？

我想将

trustExitCode

设置为false，并将

keeptemporaties

设置为true，但它不起作用。。。我不知道为什么。这是我的

~/.gitconfig

：

[merge]
        conflictstyle = diff3
        tool = p4merge
[mergetool]
        keepTemporaries = true
        keepBackup = true
        trustExitCode = false
[mergetool "p4merge"]
        trustExitCode = false
        keepTemporaries = true
[mergetool "mymeld"]
        cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE
        trustExitCode = false
        keepTemporaries = true
[mergetool "myp4merge"]
        cmd = p4merge $BASE $LOCAL $REMOTE $MERGED
        trustExitCode = false
        keepTemporaries = true

当我保存一些修改时，无论是使用p4merge、myp4merge还是mymeld，Git都不会问我预期的“合并成功了吗？[y/n]”，也不会离开file.BASE、file.REMOTE

---

我找不到错误…

我认为您应该将

path

设置添加到

mergetool XYZ

config，而不是

cmd

。这是我自己的设置，可以正常工作

[mergetool "kdiff3"]
    path = PATH_TO_KDIFF3
    trustExitCode = false
    keepTemporaries = true
[mergetool]
    keepBackup = true
[merge]
    tool = kdiff3
    conflictstyle = diff3