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: Sun, 19 Apr 2015 01:06:25 +0300 Message-ID: <5532D561.6000903@yandex.ru> References: <83fv88ta5r.fsf@gnu.org> <5532ADA3.5000006@yandex.ru> <834mod6xnm.fsf@gnu.org> <5532D397.8090602@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 1429394846 24184 80.91.229.3 (18 Apr 2015 22:07:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 18 Apr 2015 22:07:26 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Apr 19 00:07:15 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 1YjatK-0003Id-3d for geb-bug-gnu-emacs@m.gmane.org; Sun, 19 Apr 2015 00:07:10 +0200 Original-Received: from localhost ([::1]:46964 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjatI-0000tl-RP for geb-bug-gnu-emacs@m.gmane.org; Sat, 18 Apr 2015 18:07:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjatF-0000tg-7w for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 18:07:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YjatC-0004VO-2b for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 18:07:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42249) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjatB-0004VA-V3 for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 18:07:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YjatB-0005PD-Kt for bug-gnu-emacs@gnu.org; Sat, 18 Apr 2015 18:07:01 -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, 18 Apr 2015 22:07:01 +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.142939479720748 (code B ref 20292); Sat, 18 Apr 2015 22:07:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 18 Apr 2015 22:06:37 +0000 Original-Received: from localhost ([127.0.0.1]:60258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yjasm-0005OZ-Th for submit@debbugs.gnu.org; Sat, 18 Apr 2015 18:06:37 -0400 Original-Received: from mail-wi0-f169.google.com ([209.85.212.169]:36050) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Yjask-0005OE-H6 for 20292@debbugs.gnu.org; Sat, 18 Apr 2015 18:06:34 -0400 Original-Received: by wizk4 with SMTP id k4so58570639wiz.1 for <20292@debbugs.gnu.org>; Sat, 18 Apr 2015 15:06:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=t6cJyuMPfKJf12ZM7pLs0wBYDbv8xDni4kQP61hIBXk=; b=u+D6RZdlXPGHZu+Jf/TCEKlkKbPJe8wADs9V6sAM98I7Vt6+MxLeHGHid+H0p6O4YC IOh0llz57IG5T3d1hIkEJx4pylX9ojoHG+5MRs5aZEhQ2niRCSIL2Mw1PNA8lL4hd73R 3qXM8ARPBmueCpPRVcQjUqu74wS1zZM87y7vR4M2G/gW1M/GIMbK7lfTw/26XWvQ+JM2 Z5A6dDC4b5Monz6bVo+U5LMnYhxSmfLPeKtOMl9Ol3tQPAoGNxjOijSbMSJy0fHVkoz2 6VNLoaQfBGpv3M+DBve8OYSlmWsIF/9/wwp1YcI+CWAt3oGnyVzQ8hEI2yCGZlHVvYFB otKw== X-Received: by 10.194.104.71 with SMTP id gc7mr17118162wjb.114.1429394789077; Sat, 18 Apr 2015 15:06:29 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id ju2sm8566935wid.12.2015.04.18.15.06.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Apr 2015 15:06:28 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: <5532D397.8090602@yandex.ru> 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:101692 Archived-At: On 04/19/2015 12:58 AM, Dmitry Gutov wrote: >> That would mean VC behaves wit Git differently than it does with other >> VCSes (bzr, at least). > > You mean smerge-mode, not VC, right? How come? I don't even see ^^^ Sorry, please disregard this part. I can see it all right.