Re: No one understands diff3 "Temporary merge branch" conflict markers

Junio C Hamano [off-list ref] writes:

Matthieu Moy [off-list ref] writes:

quoted

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

Or replace the whole conflict markers with "Sorry, cannot compute a
merge base" text when doing the recursive merge to build the merge base.

I don't know that area well enough to have a real opinion.

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/