![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Simon Hausmann <simon@lst.de> | |
| Mon, 12 Feb 2007 21:05:21 +0000 (22:05 +0100) | ||
| committer | Simon Hausmann <simon@lst.de> | |
| Mon, 12 Feb 2007 21:05:21 +0000 (22:05 +0100) | ||
| commit | 930d3cc94e98ccecfa8762ef79f7c29af4a72769 | |
| tree | f47556f5799eea8d3cd8795ec0a4d63fde22689f | tree | snapshot |
| parent | 77083daac72612ab8ded6cba82a72924f3a867b4 | commit | diff |
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>
Signed-off-by: Simon Hausmann <simon@lst.de>
| contrib/fast-import/p4-fast-export.py | diff | blob | history |