Simon Hausmann 930d3cc94e 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 <simon@lst.de>		2007-02-12 22:05:21 +01:00
..
fast-import	When trying to map p4 integrations to git merges just record it as a single merge with the newest p4 change as secondary parent.	2007-02-12 22:05:21 +01:00