From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: charles@aurox.ch (Charles A. Roelli) Newsgroups: gmane.emacs.bugs Subject: bug#32991: 27.0.50; diff-auto-refine-mode a no-op Date: Sun, 03 Feb 2019 15:19:04 +0100 Message-ID: References: <87sgx9n9gp.fsf@mail.linkov.net> Reply-To: charles@aurox.ch Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="117902"; mail-complaints-to="usenet@blaine.gmane.org" Cc: 32991@debbugs.gnu.org, juri@linkov.net To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 03 15:11:12 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 1gqIUJ-000UWD-MS for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Feb 2019 15:11:11 +0100 Original-Received: from localhost ([127.0.0.1]:56098 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqIUI-0004J9-CY for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Feb 2019 09:11:10 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:60066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqIUC-0004Iz-L6 for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 09:11:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqIUB-0005qh-OZ for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 09:11:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:57517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqIUB-0005qW-BD for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 09:11:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gqIUA-0002Jy-4J for bug-gnu-emacs@gnu.org; Sun, 03 Feb 2019 09:11:03 -0500 X-Loop: help-debbugs@gnu.org Resent-From: charles@aurox.ch (Charles A. Roelli) Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Feb 2019 14:11:02 +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.15492030068847 (code B ref 32991); Sun, 03 Feb 2019 14:11:02 +0000 Original-Received: (at 32991) by debbugs.gnu.org; 3 Feb 2019 14:10:06 +0000 Original-Received: from localhost ([127.0.0.1]:56798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqITF-0002Id-Dt for submit@debbugs.gnu.org; Sun, 03 Feb 2019 09:10:05 -0500 Original-Received: from sinyavsky.aurox.ch ([37.35.109.145]:33238) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gqITA-0002Hz-O7 for 32991@debbugs.gnu.org; Sun, 03 Feb 2019 09:10:02 -0500 Original-Received: from sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) by sinyavsky.aurox.ch (Postfix) with ESMTP id 6C11C22A44 for <32991@debbugs.gnu.org>; Sun, 3 Feb 2019 14:15:52 +0000 (UTC) Authentication-Results: sinyavsky.aurox.ch (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=aurox.ch DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=aurox.ch; h= references:reply-to:subject:subject:in-reply-to:to:from:from :message-id:date:date; s=dkim; t=1549203350; x=1550067351; bh=5Y ydDBr191T2z6OekhtYEPMmcvIXqEa5FGMleiBscgI=; b=ro3hUHqddHTOWtfaAh +6gRTVVthZNm15BJgOnfSsb+RL3bGt7T0wGxBBvgyYIBBgQNgs7LiIi+AvTwzqqs yX9atZ9JNqvCeXo4ckvxRdCfHKf5u9Oa8jKHGcR1Kb4DwbvyDKCMizRl9mKoVzZK +m/4YtzadvH+QcI3I51fPpEDY= X-Virus-Scanned: Debian amavisd-new at test.virtualizor.com Original-Received: from sinyavsky.aurox.ch ([127.0.0.1]) by sinyavsky.aurox.ch (sinyavsky.aurox.ch [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id swju20Dk0Qad for <32991@debbugs.gnu.org>; Sun, 3 Feb 2019 14:15:50 +0000 (UTC) Original-Received: from gray (unknown [IPv6:2a02:1206:4519:d090:c62c:3ff:fe30:b864]) by sinyavsky.aurox.ch (Postfix) with ESMTPSA id B6C2222832; Sun, 3 Feb 2019 14:15:49 +0000 (UTC) In-reply-to: (message from Stefan Monnier on Sun, 03 Feb 2019 07:37:36 -0500) 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:155049 Archived-At: > From: Stefan Monnier > 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.