.gitconfig: conflictstyle = diff3 and co alias (not that tab completion is not that handy anymore)