Re: [PATCH 0/2] RFC: implement new zdiff3 conflict style

From: Johannes Sixt <j6t@kdbg.org>
Date: Jun 15, 2021, 21:36 UTC
Message-ID: <55d0eb59-10a0-1dff-f195-4d660c6028e0@kdbg.org>
In-Reply-To: <pull.1036.git.git.1623734171.gitgitgadget@gmail.com>

Am 15.06.21 um 07:16 schrieb Elijah Newren via GitGitGadget:

> Implement a zealous diff3, or "zdiff3". This new mode is identical to
> ordinary diff3 except that it allows compaction of common lines between the
> two sides of history, if those common lines occur at the beginning or end of
> a conflict hunk.

As a data point, I tried this series (cf9d93e547 en/zdiff3) on my criss-cross merge test case that started this adventure, and it produces the very same output as diff3; cf. https://lore.kernel.org/git/60883e1b-787f-5ec2-a9af-f2f6757d3c43@kdbg.org/

-- Hannes

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