From: Felipe Contreras Date: Thu, 10 Jun 2021 13:18:58 GMT Subject: Re: [PATCH 7/7] xdiff: make diff3 the default conflictStyle Message-ID: <60c211423f46f_b25b1208de@natae.notmuch> In-Reply-To: Đoàn Trần Công Danh wrote: > On 2021-06-10 08:41:21+0200, Johannes Sixt wrote: > > Am 09.06.21 um 21:28 schrieb Felipe Contreras: > > > 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