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

Đoàn Trần Công Danh wrote:

On 2021-06-10 08:41:21+0200, Johannes Sixt [off-list ref] wrote:

quoted

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 agree, despite using 3-way merging (with external tools) to resolve conflicts.

I prefer the current conflict style, aka no-diff3 conflict style.

Defaults are not for you, they are for the majority of users.

-- 
Felipe Contreras