Kdiff3 won't open with mergetool command
I have conflicts, so I type:
git mergetool
I then get a message saying:
Hit return to start merge resolution tool
Normally when I do this, it open kdiff3 so I can merge the differences.
now when I do it, it just continues to the next file, and kdiff3 doesn't open at all.
I triple cheched my git config and my system path and all seems perfect. Config file is as follows:
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[diff]
guitool = kdiff3
[difftool "kdiff3"]
path = c:/Program Files (x86)/KDiff3/kdiff3.exe
[core]
editor = \"C:/Program Files (x86)/GitExtensions/GitExtensions.exe\" fileeditor autocrlf = true
[user]
name = James Farrell
email = [email protected]
[github]
user = whygosystems
token = 87d00c2e613b3a7c8c1be817b75b8a33
[diff]
external = C:/Program Files (x86)/Git/cmd/git-diff-wrapper.sh
Anyone have any ideas what might be wrong?
I have a feeling (though I could be wrong, that this has been a problem, since I installed the new Github windows client)....
Answer
I realize this is old, but for future googlers, KDiff3 also has an option where if the merge is trivial, it will resolve it silently and never even show a window.
I've had that happen to me in the past, so it might be what's happening for you. I think the option is called 'Auto save and quit on merge without conflicts'.