I think you should add path
setting to mergetool XYZ
config instead of cmd
. Here is my own setting that works properly.
[mergetool "kdiff3"]
path = PATH_TO_KDIFF3
trustExitCode = false
keepTemporaries = true
[mergetool]
keepBackup = true
[merge]
tool = kdiff3
conflictstyle = diff3