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
