GNU bug report logs - #32991
27.0.50; diff-auto-refine-mode a no-op

Previous Next

Full log

View this message in rfc822 format

From: charles <at> aurox.ch (Charles A. Roelli)
To: Stefan Monnier <monnier <at> IRO.UMontreal.CA>
Cc: 32991 <at> debbugs.gnu.org, juri <at> linkov.net
Subject: bug#32991: 27.0.50; diff-auto-refine-mode a no-op
Date: Sun, 03 Feb 2019 15:19:04 +0100

> From: Stefan Monnier <monnier <at> IRO.UMontreal.CA>
> Date: Sun, 03 Feb 2019 07:37:36 -0500
> 
> > Why are 2-way conflicts worthless?
> 
> Because they give less info than 3-way conflicts and they're generated
> from 3 files so you can "always" get the superior 3-way conflicts
> instead of the inferior 2-way ones.

Oh, like the ones you can get by setting Git's "merge.conflictStyle"
to "diff3".  Makes sense.

> > By the way, does the updated change I sent in
> > https://debbugs.gnu.org/cgi/bugreport.cgi?bug=32991#38 look okay
> > to you?
> 
> Haven't had a chance to look at it yet,
> 
> 
>         Stefan

Okay, no rush.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.