From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 22 Jul 2020 05:50:08 GMT
Subject: Re: Improving merge of tricky conflicts
Message-ID: <4df975f0-e4b1-afa1-cac1-f38e6d31a0d8@kdbg.org>
In-Reply-To: <a0418859-c62e-c207-a1b0-1b1aaf178527@gmail.com>

Am 22.07.20 um 01:29 schrieb B. Stebler:
> I have been looking for a tool to display merge conflicts, that instead
> of showing the two versions of the conflicting section, would show the
> diff for that section in both conflicting commits.

Perhaps you want to configure `merge.conflictStyle=diff3`? It does not
exactly show a diff, but it writes the base version of the conflicted
part in addition to "ours" and "theirs".

-- Hannes