When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.
[gitweb.git] / contrib /
drwxr-xr-x   parent (dest: ; base: 930d3cc94e98ccecfa8762ef79f7c29af4a72769)
drwxr-xr-x - fast-import