a few more fixups for mergebases, --from, and --onto