Re: [RFC/PATCH] mergetool: use resolved conflicts in all the views

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 17, 2020, 05:19 UTC
Message-ID: <xmqqmtydypp4.fsf@gitster.c.googlers.com>
In-Reply-To: <5fda9b3f4979c_973f2083@natae.notmuch>

Felipe Contreras <felipe.contreras@gmail.com> writes:

> The implementation details of the proposed patch are not relevant at
> this point; it was just to show an example of what Seth's diffconflicts
> vim plugin does.

Sorry for commenting on the "irrelevant" part; as the patch was marked with RFC label, I bothered to read it and tried to give comments, but it wasn't clear which part was welcoming comments and which parts were off limits ;-)

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