From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii 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 11:55:23 +0300 Message-ID: <83617shpfo.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1431766586 28006 80.91.229.3 (16 May 2015 08:56:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 May 2015 08:56:26 +0000 (UTC) Cc: esr@snark.thyrsus.com, 20292@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat May 16 10:56: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 1YtXtF-0000xg-Td for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 10:56:14 +0200 Original-Received: from localhost ([::1]:34001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtXtF-0005Qa-2E for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 04:56:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtXtC-0005QJ-3H for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:56:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtXt7-0005Ut-DY for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:56:10 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36802) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtXt7-0005UV-A0 for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:56:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YtXt3-0003hP-Ph for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:56:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 16 May 2015 08:56: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.143176653314184 (code B ref 20292); Sat, 16 May 2015 08:56:01 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 16 May 2015 08:55:33 +0000 Original-Received: from localhost ([127.0.0.1]:46777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtXsa-0003gi-Iy for submit@debbugs.gnu.org; Sat, 16 May 2015 04:55:32 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:37226) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtXsX-0003gQ-Km for 20292@debbugs.gnu.org; Sat, 16 May 2015 04:55:30 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NOF00D00PWNFZ00@a-mtaout20.012.net.il> for 20292@debbugs.gnu.org; Sat, 16 May 2015 11:55:22 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NOF00DHJQ4AG800@a-mtaout20.012.net.il>; Sat, 16 May 2015 11:55:22 +0300 (IDT) In-reply-to: <5556F9D8.4070503@yandex.ru> X-012-Sender: halo1@inter.net.il 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:102871 Archived-At: > Cc: monnier@iro.umontreal.ca, esr@snark.thyrsus.com, 20292@debbugs.gnu.org > From: Dmitry Gutov > Date: Sat, 16 May 2015 11:03:36 +0300 > > On 05/16/2015 10:15 AM, Eli Zaretskii wrote: > > > Thanks. Just so I'm sure my reading of the patch is correct: this > > option will never modify the behavior for conflicts that arise during > > a "normal" merge (as opposed to "stash pop", for example), right? > > That's the intention, yes. Great, thanks.