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 16:15:12 +0300 Message-ID: <555742E0.40909@yandex.ru> References: <83fv88ta5r.fsf@gnu.org> <5533F446.4020400@yandex.ru> <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> <83bnhlgfi0.fsf@gnu.org> <5556F9D8.4070503@yandex.ru> <83617shpfo.fsf@gnu.org> 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 1431782183 28771 80.91.229.3 (16 May 2015 13:16:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 May 2015 13:16:23 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292-done@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 16 15:16: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 1Ytbwp-0007ar-Ol for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 15:16:11 +0200 Original-Received: from localhost ([::1]:34602 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ytbwp-0006Ow-4T for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 09:16:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38492) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ytbwl-0006OL-Iw for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:16:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ytbwg-00051O-LF for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:16:07 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ytbwg-00051J-Ie for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:16:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Ytbwg-0003EV-Ah for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 09:16:02 -0400 Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 May 2015 13:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 20292 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 20292@debbugs.gnu.org, dgutov@yandex.ru, eliz@gnu.org Original-Received: via spool by 20292-done@debbugs.gnu.org id=D20292.143178212512373 (code D ref 20292); Sat, 16 May 2015 13:16:01 +0000 Original-Received: (at 20292-done) by debbugs.gnu.org; 16 May 2015 13:15:25 +0000 Original-Received: from localhost ([127.0.0.1]:46852 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ytbw4-0003DU-AV for submit@debbugs.gnu.org; Sat, 16 May 2015 09:15:24 -0400 Original-Received: from mail-wi0-f181.google.com ([209.85.212.181]:37854) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ytbw1-0003DF-OP for 20292-done@debbugs.gnu.org; Sat, 16 May 2015 09:15:22 -0400 Original-Received: by wibt6 with SMTP id t6so21568876wib.0 for <20292-done@debbugs.gnu.org>; Sat, 16 May 2015 06:15:16 -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=9Wq4oCX1hFeIsDCbEZPB9ortdIZivc+n84uM0uIWG/E=; b=zHrC0WeuzMerxgkaZzD+zU3x2X5Mp/wi+Zs2OCtLNdxY3ZhE4ghitHimq7/KAi6JRz djSvyIyRpzveq9RkEh2X4uJYyX1JKepwG+FU7y0JoEX6w0Kxx7jPwnXDj5wwR6r0DE3Q 6kZSE0+SxMMMEO1euvOlLw8OaFBt78KMl+ANLqMgpH/akGysbdplJKMWMEk8J7qCmt78 OQL0Qc0vNu53FlET8kF6sJ4IvlQV+GWxO1ZDEw1NauIVKLew3xCwTFqFjdEKvZsfiOk4 WyEVtpyCxjaebAlMz1FtPSENTCRVdkXG4CXaMKbOGFYQDYwdicTR/EMOFXDzfw3g9Fxb VHhA== X-Received: by 10.194.121.135 with SMTP id lk7mr5665917wjb.109.1431782116119; Sat, 16 May 2015 06:15:16 -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 r9sm7291860wjo.26.2015.05.16.06.15.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 06:15:14 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: <83617shpfo.fsf@gnu.org> 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:102874 Archived-At: On 05/16/2015 11:55 AM, Eli Zaretskii wrote: > Great, thanks. Pushed, with some tweaks.