contrib / p4import / READMEon commit merge script: refuse to merge during merge (6239af1)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.