contrib / p4import / READMEon commit merge: teach -Xours/-Xtheirs to binary ll-merge driver (a944af1)
   1Please see contrib/fast-import/git-p4 for a better Perforce importer.