Re: Improving merge of tricky conflicts

Johannes Sixt [off-list ref] writes:

Am 22.07.20 um 01:29 schrieb B. Stebler:

quoted

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