Fix bogus error message from merge-recursive error path