contrib / p4import / READMEon commit Teach git-pull to pass -X<option> to git-merge (ee2c795)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.