How to configure kdiff3 as a mergetool in msysgit. (I think if you install kdiff3 before msysgit it is picked up automatically, if not, do the following after installing both). In git bash: git config…