From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 11 Jun 2021 14:28:31 GMT
Subject: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle
Message-ID: <60c3730f6582b_3ad920842@natae.notmuch>
In-Reply-To: <xmqqo8cc3maq.fsf@gitster.g>

Junio C Hamano wrote:
> Johannes Sixt <j6t@kdbg.org> writes:
> 
> > The case that inner conflicts are presented sub-optimally under diff3
> > remains, though.
> 
> I agree that until that happens (necessary but not sufficient
> condition), it is premature to recommend diff3 style to be the
> default.

Why? Most experienced git developers have no issue with diff3. So
presumably it's good enough as it is.

Yes, we should consider improving that issue stated above, but
*necessary*? I don't think so.

-- 
Felipe Contreras