Switched to kdiff3 for git mergetool