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

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Dec 17, 2020, 05:43 UTC
Message-ID: <5fdaeffc8b6c_d0e262088b@natae.notmuch>
In-Reply-To: <xmqqmtydypp4.fsf@gitster.c.googlers.com>

Junio C Hamano wrote:

Show 10 quoted lines

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

All parts welcomed comments.

I'm just saying the idea is what's important in my opinion.

-- 
Felipe Contreras

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