From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: Tue, 07 Jul 2015 21:44:38 GMT
Subject: Re: No one understands diff3 "Temporary merge branch" conflict markers
Message-ID: <vpqd203lk1l.fsf@anie.imag.fr>
In-Reply-To: <xmqqzj373lrn.fsf@gitster.dls.corp.google.com>

Junio C Hamano <gitster@pobox.com> writes:

> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> 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.

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/