contrib / p4import / READMEon commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.