Re: No one understands diff3 "Temporary merge branch" conflict markers
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:05:41
Matthieu Moy [off-list ref] writes:
... I would say: the recursive merge-base was computed internally, but not really meant to be shown to the user.
I wonder if the output becomes easier to read if we unconditionally turned off diff3-style for inner merges.