[PATCH] archimport: Actually cope with merges from "remote" repositories. Plus: Nicer...