gitconfig: no merge.diff3 for now