Integrating KDiff3 with git on windows

Install KDiff3, edit git config to have the following lines

[merge]
     tool = kdiff3

[mergetool "kdiff3"]
     path = C:/Program Files/KDiff3/kdiff3.exe
     keepBackup = false
     trustExitCode = false

 

From here