When trying to map p4 integrations to git merges just record it as a single merge...
treef47556f5799eea8d3cd8795ec0a4d63fde22689f
drwxr-xr-x - contrib