gitconfig: Change merge tool to kdiff3