From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#20292: 24.5; Saving Git-controlled file with merge conflicts after "stash pop" stages the file Date: Sat, 16 May 2015 17:13:15 +0300 Message-ID: <5557507B.80901@yandex.ru> References: <83fv88ta5r.fsf@gnu.org> <83fv7u6epr.fsf@gnu.org> <838udm61ur.fsf@gnu.org> <5536FE56.406@yandex.ru> <83egnc4nu5.fsf@gnu.org> <55528906.7060606@yandex.ru> <83zj58jvri.fsf@gnu.org> <834mnfjjlz.fsf@gnu.org> <5554DBB2.3070005@yandex.ru> <83mw17huqr.fsf@gnu.org> <5554EDF5.5050606@yandex.ru> <83iobvhtzw.fsf@gnu.org> <5554F2F3.6010109@yandex.ru> <83fv6zhs3j.fsf@gnu.org> <55550482.1020404@yandex.ru> <55568661.90506@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1431785663 15805 80.91.229.3 (16 May 2015 14:14:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 May 2015 14:14:23 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 16 16:14:12 2015 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 1Ytcqx-0006br-ND for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 16:14:11 +0200 Original-Received: from localhost ([::1]:34766 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ytcqw-00014i-Rj for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 10:14:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48681) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ytcqs-00014Q-Ox for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 10:14:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ytcqp-0001ZI-7U for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 10:14:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ytcqp-0001Z8-3r for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 10:14:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Ytcqo-0004pX-Ew for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 10:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 May 2015 14:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 20292 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 20292-submit@debbugs.gnu.org id=B20292.143178560518512 (code B ref 20292); Sat, 16 May 2015 14:14:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 16 May 2015 14:13:25 +0000 Original-Received: from localhost ([127.0.0.1]:47396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtcqC-0004oV-PP for submit@debbugs.gnu.org; Sat, 16 May 2015 10:13:25 -0400 Original-Received: from mail-wi0-f177.google.com ([209.85.212.177]:38175) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtcqA-0004oJ-Qb for 20292@debbugs.gnu.org; Sat, 16 May 2015 10:13:23 -0400 Original-Received: by wicnf17 with SMTP id nf17so22625578wic.1 for <20292@debbugs.gnu.org>; Sat, 16 May 2015 07:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=4CUf4nBV7U46NzEQ7oanb+KU7RE/wPFVzlRBybDPLms=; b=WO63p872CNrnyWYO0JDH7R42+VCGzvXunRFFv4M4ByTTa1bEHb79ZDS+pqXbasW+05 br/OLxEjU5Is3VwoOEjcdnyohE4y2SReGML1kLjtfr86eWwHuDEC9clg4HKq6ana62mY nFEjR3YwPF7HF0Z8fLdWgHyUBtarmUkNWA3DVADfsE0He87lglGVVmK8PFh2FHu88ElK IzmTNg/DSuujY7h1hBwdRU9hhla5A6K+bfZ9IKaavtU08RmSvzoxsHPdY+Fo0F4A0NN+ zNDuaDxU9esoqQFVURS86DWixGzmG/HkGXduBp3n8dXnI7ntpPCiFi53ahByJ7xQnLbD Q6HQ== X-Received: by 10.180.11.236 with SMTP id t12mr6264242wib.19.1431785597223; Sat, 16 May 2015 07:13:17 -0700 (PDT) Original-Received: from [192.168.0.185] (static-nbl2-118.cytanet.com.cy. [212.31.107.118]) by mx.google.com with ESMTPSA id l6sm3066871wib.18.2015.05.16.07.13.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 07:13:17 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: 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:102879 Archived-At: On 05/16/2015 04:53 PM, Stefan Monnier wrote: > This is redundant. > If you switch to "(unless (or ..." you'll get rid of one "not". These should be addressed now.