Re: [PATCH] merge-recursive: fix the fix to the diff3 common ancestor label

From: Elijah Newren <newren@gmail.com>
Date: Oct 8, 2019, 16:16 UTC
Message-ID: <CABPp-BG-h3yDeDQqa78WisnXNzqsgmBx7T_MS5LbSx5an-FQLg@mail.gmail.com>
In-Reply-To: <xmqqr23oneui.fsf@gitster-ct.c.googlers.com>

On Mon, Oct 7, 2019 at 7:36 PM Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

>
> Elijah Newren <newren@gmail.com> 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).

Oops, yes.

Show 7 quoted lines

> > 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/

Ugh, two simple mistakes in the commit message. I see you've not only proofread the commit but fixed up the commit message for me in pu; thanks.

Elijah