From: Johannes Sixt <j6t@kdbg.org>
Date: Fri, 11 Jun 2021 16:53:39 GMT
Subject: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
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