From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 07 Jul 2015 17:44:44 GMT
Subject: Re: No one understands diff3 "Temporary merge branch" conflict markers
Message-ID: <xmqqzj373lrn.fsf@gitster.dls.corp.google.com>
In-Reply-To: <vpqbnfondsr.fsf@anie.imag.fr>

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.