Something I don’t do often and always forget is how to setup msysgit to use KDiff3 as its merge tool.
To get it done edit your .gitconfig and add the following:
[merge]
tool = kdiff3
[mergetool "kdiff3"]
path = C:/Program Files/KDiff3/kdiff3.exe
keepBackup = false
trustExitCode = false