contrib / p4import / READMEon commit git-merge documentation: describe how conflict is presented (70a3f89)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.