How to set up Git mergetool and difftool for KDiff3 on Windows

I found many help documents to set up Git mergetool and difftool for KDiff3 on Windows.  But none of them was quite right for my Windows 10 and Git 2.6.2.windows.1.


Open the C:\Users\\.gitconfig file.

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.