contrib / p4import / READMEon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.