| commit | 1a2edf4e8dff05fea66daf82c675cfab673c1242 | |
| author | Simon Hausmann <shausman@trolltech.com> | |
| Sun, 17 Jun 2007 13:10:24 +0000 (17 15:10 +0200) | ||
| committer | Simon Hausmann <shausman@trolltech.com> | |
| Sun, 17 Jun 2007 13:10:24 +0000 (17 15:10 +0200) | ||
| tree | dd2676820acdb749f5cd7b2648c1707868efced6 | treesnapshot (tar.gz zip) |
| parent | 6555b2ccfe63913b3e5c8b02e117f0f476307ca2 | commitdiff |
Warn about conflicting p4 branch mappings and use the first one found.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Simon Hausmann <simon@lst.de>
| contrib/fast-import/git-p4 | diffblobblamehistory |