On Thu, Jun 10, 2021 at 08:41:21AM +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 didn't look too deeply at your example, but I suspect it may be related to the fact that diff3 does not try to minimize the conflicts as much (and then the recursive merge on top of that piles on extra layers of confusion). There's a lot more discussion in this old thread: https://lore.kernel.org/git/20130306150548.GC15375@xxxxxxxxxxxxxx/ -Peff
