archimport: don't die on merge-base failure