In the GIT Bash shell open the global configuration file with:
vi ~/.gitconfig
The add the following lines to the file:
[difftool "kdiff3"] path = C:/Program Files (x86)/KDiff3/kdiff3.exe trustExitCode = false [difftool] prompt = false [diff] tool = kdiff3 [mergetool "kdiff3"] path = C:/Program Files (x86)/KDiff3/kdiff3.exe trustExitCode = false [mergetool] keepBackup = false [merge] tool = kdiff3
You would have to change the paths to point to the directory where Kdiff3 is installed.
Save and make a modification on a file. Then you can check if everything is correctly configurated with:
git difftool
