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

Johannes Sixt wrote:

Am 09.06.21 um 21:28 schrieb Felipe Contreras:

quoted

Virtually everyone is using it, and it's one of the first things we
teach newcomers in order to resolve conflicts efficiently.

Let's make it the default.

I tested diff3 style the VERY FIRST TIME the other day and was greated
with the below. Needless to say that this change is a no-go from my POV.

"I found a bug" is not a valid reason not to do approach X.

The bug gets fixed and the approach continues.

Cheers.

-- 
Felipe Contreras