From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Jul 2020 21:14:25 GMT
Subject: Re: Improving merge of tricky conflicts
Message-ID: <xmqqwo2v45hq.fsf@gitster.c.googlers.com>
In-Reply-To: <874kpzmhis.fsf@osv.gnss.ru>

Sergey Organov <sorganov@gmail.com> writes:

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

There isn't, unless you count

    $ git -c merge.conflictstyle=diff3 merge side-branch

as a "command line option" (which may technically is).