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

From: Junio C Hamano <gitster@pobox.com>
Date: Oct 8, 2019, 02:36 UTC
Message-ID: <xmqqr23oneui.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20191007155211.23067-1-newren@gmail.com>

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).

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

> attention to the setting of that variable in merge_recursive_internal().

Thanks, again.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.