Re: [PATCH v4 04/12] merge-tree: implement real merges

From: Junio C Hamano <gitster@pobox.com>
Date: Feb 14, 2022, 17:51 UTC
Message-ID: <xmqqwnhx2v6i.fsf@gitster.g>
In-Reply-To: <d7b51da94e65db79aa59ca331e178741d3c50bc2.1644698093.git.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

> +<branch1>.  The result of this second form is is similar to what

I haven't read the rest of the patches, but this like somehow stood out in the interdiff.

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