diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2005-09-30 07:15:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-02 06:14:48 (GMT) |
| commit | 37f15d50c93398eac90370cfe07315905501bdad (patch) | |
| tree | 3ca0673be823fbda9c1fc731cb0d9bf08fddc6aa /merge-index.c | |
| parent | 38ec15a973a1f075f0d94d130b0ef279562921cd (diff) | |
| download | git-37f15d50c93398eac90370cfe07315905501bdad.zip git-37f15d50c93398eac90370cfe07315905501bdad.tar.gz git-37f15d50c93398eac90370cfe07315905501bdad.tar.bz2 | |
[PATCH] archimport: Actually cope with merges from "remote" repositories. Plus: Nicer messages.
archimport was refusing to import commits that had merges from repositories
that it didn't know about. Fixed.
Also brings in nicer messages.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions