Using KDiff3 as Git GUI Merge Tool on Windows XP and Windows 7

1. Add the KDiff3 directory to your Windows System Path (e.g. C:\Program Files\KDiff3\)
2. Add kdiff3 as your Git mergetool (From Git Bash, run git config --global merge.tool kdiff3)
3. Add kdiff3 complete path to Git Config (From Git Bash, run git config --global meregtool.kdiff3.path "C:/Program Files/KDiff3/kdiff3.exe")
4. Go into Git GUI settings and set the mergetool to kdiff3 (if Git GUI doesn't pick up this setting from git config, which it should)