contrib / p4import / READMEon commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.