Open the C:\Users\
Add the following lines (Git falls back to the mergetool for difftool, so you need only to add mergetool.)
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = C:\\Program Files\\KDiff3\\kdiff3.exe
keepBackup = false
trustExitCode = false
Save the file.
That is what works for me.
No comments:
Post a Comment