Re: [PATCH 3/4] merge options: add a conflict style member

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 9, 2024, 05:46 UTC
Message-ID: <xmqqplw4dkki.fsf@gitster.g>
In-Reply-To: <CABPp-BFBNDkdL5Z-VOrv2Z3aWaA3OpWFqd6ZGmU9YC8jBRsAog@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

> a different suffix), I'm still not understanding why ll-merge makes
> more sense to you and Phillip than merge-ll.
> Could you explain more?

Language and grammar? In other words, "low-level merge routines" is an understandable phrase, while "merge lo-level routines" is not.

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