gitconfig: diff3 for merge conflicts