From: Sergey Organov <sorganov@gmail.com>
Date: Wed, 22 Jul 2020 20:17:15 GMT
Subject: Re: Improving merge of tricky conflicts
Message-ID: <874kpzmhis.fsf@osv.gnss.ru>
In-Reply-To: <4df975f0-e4b1-afa1-cac1-f38e6d31a0d8@kdbg.org>

Johannes Sixt <j6t@kdbg.org> writes:

> 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`?

Is there 'git merge' command-line option for that? I failed to find one.

Thanks,
-- Sergey