contrib / p4import / READMEon commit Be more user-friendly when refusing to do something because of conflict. (d38a30d)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.