From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#32991: 27.0.50; diff-auto-refine-mode a no-op Date: Sun, 03 Feb 2019 07:37:36 -0500 Message-ID: References: <87sgx9n9gp.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="253580"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 32991@debbugs.gnu.org, juri@linkov.net To: charles@aurox.ch (Charles A. Roelli) Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 03 13:38:10 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1gqH2I-0013oS-2P for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Feb 2019 13:38:10 +0100 Original-Received: from localhost ([127.0.0.1]:54910 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqH2H-0006Z0-42 for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Feb 2019 07:38:09 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:42489) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqH2A-0006Yp-SA for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 07:38:03 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqH2A-0002Cw-39 for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 07:38:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:57506) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqH29-0002Cp-Vu for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 07:38:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gqH29-00009O-QA for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 07:38:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Feb 2019 12:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 32991 X-GNU-PR-Package: emacs Original-Received: via spool by 32991-submit@debbugs.gnu.org id=B32991.1549197471563 (code B ref 32991); Sun, 03 Feb 2019 12:38:01 +0000 Original-Received: (at 32991) by debbugs.gnu.org; 3 Feb 2019 12:37:51 +0000 Original-Received: from localhost ([127.0.0.1]:56787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqH1z-00008z-Br for submit@debbugs.gnu.org; Sun, 03 Feb 2019 07:37:51 -0500 Original-Received: from pruche.dit.umontreal.ca ([132.204.246.22]:55509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqH1y-00008s-CV for 32991@debbugs.gnu.org; Sun, 03 Feb 2019 07:37:50 -0500 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by pruche.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x13Cbbg6018726; Sun, 3 Feb 2019 07:37:38 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id F28386ABCC; Sun, 3 Feb 2019 07:37:36 -0500 (EST) In-Reply-To: (Charles A. Roelli's message of "Sun, 03 Feb 2019 12:42:24 +0100") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0.1 X-NAI-Spam-Rules: 3 Rules triggered TRK_NCM1=0.1, EDT_SA_DN_PASS=0, RV6474=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6474> : inlines <7010> : streams <1811963> : uri <2790099> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:155048 Archived-At: > 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