|
From: | Stefan Monnier |
Subject: | bug#32991: 27.0.50; diff-auto-refine-mode a no-op |
Date: | Sun, 03 Feb 2019 07:37:36 -0500 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
> 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. > 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
[Prev in Thread] | Current Thread | [Next in Thread] |