Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle

From: Johannes Sixt <j6t@kdbg.org>
Date: Jun 11, 2021, 16:53 UTC
Message-ID: <763be21c-c87e-6b02-8ca4-256c3c804995@kdbg.org>
In-Reply-To: <60c3724de35b4_3ad920839@natae.notmuch>

Am 11.06.21 um 16:25 schrieb Felipe Contreras:

> Personally I have never experienced what you posted, so maybe there's
> something else happening behind the scenes.

I have to do a lot of criss-cross merges lately.

> Maybe merge-ort changed something.

It produces the same result.

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