contrib / p4import / READMEon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.