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

Signed-off-by: Simon Hausmann <088e16a1019277b15d58faf0541e11910eb756f6@lst.de>

destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git,destenson/git