From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs Subject: bug#18850: smerge-mode: use diff-check-labels Date: Tue, 28 Oct 2014 09:44:51 -0400 Message-ID: References: <87h9ysecea.fsf@violet.siamics.net> <87egttdd37.fsf_-_@violet.siamics.net> <874mupdcpm.fsf@violet.siamics.net> <87vbn5bpnk.fsf@violet.siamics.net> <87r3xsblg7.fsf@violet.siamics.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1414503930 13625 80.91.229.3 (28 Oct 2014 13:45:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 28 Oct 2014 13:45:30 +0000 (UTC) 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 Oct 28 14:45:23 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Xj75O-0007Ed-3A for geb-bug-gnu-emacs@m.gmane.org; Tue, 28 Oct 2014 14:45:22 +0100 Original-Received: from localhost ([::1]:39309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj75N-0006rF-Nl for geb-bug-gnu-emacs@m.gmane.org; Tue, 28 Oct 2014 09:45:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj75D-0006nv-A0 for bug-gnu-emacs@gnu.org; Tue, 28 Oct 2014 09:45:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xj755-0004F8-Rw for bug-gnu-emacs@gnu.org; Tue, 28 Oct 2014 09:45:11 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:45280) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xj755-0004Ek-PK for bug-gnu-emacs@gnu.org; Tue, 28 Oct 2014 09:45:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Xj754-0000hr-5w for bug-gnu-emacs@gnu.org; Tue, 28 Oct 2014 09:45:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 28 Oct 2014 13:45:01 +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 Original-Received: via spool by 18850-submit@debbugs.gnu.org id=B18850.14145039002699 (code B ref 18850); Tue, 28 Oct 2014 13:45:01 +0000 Original-Received: (at 18850) by debbugs.gnu.org; 28 Oct 2014 13:45:00 +0000 Original-Received: from localhost ([127.0.0.1]:37378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xj751-0000hT-Mq for submit@debbugs.gnu.org; Tue, 28 Oct 2014 09:44:59 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:48621) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Xj74z-0000hH-Fy for 18850@debbugs.gnu.org; Tue, 28 Oct 2014 09:44:57 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Au0MAOatTlRFpY87/2dsb2JhbABcgw6DYoZ+y1MEAgKBHBcBAXyEAwEBBFYjEAs0EhQYDSSIVMtyAQEBAQEFAQEBAR6RCAeESwWyIIFvhBQhgnoBAQE X-IPAS-Result: Au0MAOatTlRFpY87/2dsb2JhbABcgw6DYoZ+y1MEAgKBHBcBAXyEAwEBBFYjEAs0EhQYDSSIVMtyAQEBAQEFAQEBAR6RCAeESwWyIIFvhBQhgnoBAQE X-IronPort-AV: E=Sophos;i="5.04,797,1406606400"; d="scan'208";a="95416492" Original-Received: from 69-165-143-59.dsl.teksavvy.com (HELO pastel.home) ([69.165.143.59]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 28 Oct 2014 09:44:51 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id BF2D462B8; Tue, 28 Oct 2014 09:44:51 -0400 (EDT) In-Reply-To: <87r3xsblg7.fsf@violet.siamics.net> (Ivan Shmakov's message of "Tue, 28 Oct 2014 09:19:36 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.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-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:95193 >> -L (use --label instead) OK, then let's switch to --label everywhere, thanks, Stefan