en/zdiff3 (was: Re: What's cooking in git.git (Nov 2021, #07; Mon, 29))

From: Elijah Newren <newren@gmail.com>
Date: Nov 30, 2021, 23:52 UTC
Message-ID: <CABPp-BERnA+tyP0RTQ-iXcm5wwO5GbjasP3O-MjqSHGauyibFQ@mail.gmail.com>
In-Reply-To: <xmqqzgpm2xrd.fsf@gitster.g>

On Tue, Nov 30, 2021 at 6:49 AM Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

>
> * en/zdiff3 (2021-09-20) 2 commits
>  - update documentation for new zdiff3 conflictStyle
>  - xdiff: implement a zealous diff3, or "zdiff3"
>
>  "Zealous diff3" style of merge conflict presentation has been added.
>
>  What's the status of this thing?

I resubmitted it before you added this question, and have pointed out the resubmission in response to the past "What's cooking" emails, but perhaps it'll be easier for me to just resubmit with no changes. I'll do that.

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