When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
drwxr-xr-x - contrib