Elijah Newren <newren@xxxxxxxxx> writes:
> In commit 208e69a4ebce ("merge-recursive: fix the diff3 common ancestor
I think the above was an earlier incarntion of what is now known as
8e4ec337 ("merge-recursive: fix the diff3 common ancestor label for
virtual commits", 2019-10-01).
> label for virtual commits", 2019-09-30) which was a fix to commit
> 743474cbfa8b ("merge-recursive: provide a better label for diff3 common
> ...
> The handling for "constructed merge base" worked by allowing
> opt->ancestor to be set in merge_recursive_generic(), so we payed
s/payed/paid/
> attention to the setting of that variable in merge_recursive_internal().
Thanks, again.
