contrib / p4import / READMEon commit merge_content(): Check whether D/F conflicts are still present (4ab9a15)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.