From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#18850: smerge-mode: use diff-check-labels Date: Tue, 25 Jun 2019 23:22:35 +0200 Message-ID: References: <87h9ysecea.fsf@violet.siamics.net> <87egttdd37.fsf_-_@violet.siamics.net> <874mupdcpm.fsf@violet.siamics.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="199713"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 18850@debbugs.gnu.org To: Ivan Shmakov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 25 23:25:16 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.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hfswG-000po6-2F for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jun 2019 23:25:16 +0200 Original-Received: from localhost ([::1]:35354 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfswE-0003Os-UB for geb-bug-gnu-emacs@m.gmane.org; Tue, 25 Jun 2019 17:25:15 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:44702) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfsv8-0002sE-04 for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 17:24:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfsv4-0002bZ-E6 for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 17:24:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48397) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hfsv4-0002ax-7z for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 17:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hfsv4-0007xS-3C for bug-gnu-emacs@gnu.org; Tue, 25 Jun 2019 17:24:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 25 Jun 2019 21:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 18850 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch fixed Original-Received: via spool by 18850-submit@debbugs.gnu.org id=B18850.156149778430508 (code B ref 18850); Tue, 25 Jun 2019 21:24:02 +0000 Original-Received: (at 18850) by debbugs.gnu.org; 25 Jun 2019 21:23:04 +0000 Original-Received: from localhost ([127.0.0.1]:33706 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfsu3-0007vA-HO for submit@debbugs.gnu.org; Tue, 25 Jun 2019 17:23:03 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:56946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hfstx-0007uv-2Z for 18850@debbugs.gnu.org; Tue, 25 Jun 2019 17:22:57 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=stories) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hfstg-0004YF-5n; Tue, 25 Jun 2019 23:22:41 +0200 In-Reply-To: <874mupdcpm.fsf@violet.siamics.net> (Ivan Shmakov's message of "Mon, 27 Oct 2014 10:33:09 +0000") 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:161429 Archived-At: Ivan Shmakov writes: > block 18850 by 18824 > thanks > > Another try. OK; applied. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no