Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle

Junio C Hamano wrote:

Johannes Sixt [off-list ref] writes:

quoted

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