Re: Improving merge of tricky conflicts
Sergey Organov <sorganov@gmail.com> writes:
Show 10 quoted lines
> 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).
Junio C Hamano <gitster@pobox.com>