diff: check for merge bases before assigning sym->base