Explain it in local-upstream branch terms so it's easier to grasp than
with the `one` and `two` naming from the merge-base code.