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 11:03:36 +0300 Message-ID: <5556F9D8.4070503@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> 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 1431763461 15456 80.91.229.3 (16 May 2015 08:04:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 16 May 2015 08:04:21 +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 Sat May 16 10:04:10 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 1YtX4r-0006k2-Fl for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 10:04:09 +0200 Original-Received: from localhost ([::1]:33905 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtX4q-0004NB-RS for geb-bug-gnu-emacs@m.gmane.org; Sat, 16 May 2015 04:04:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41718) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtX4n-0004N6-Ht for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:04:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YtX4k-000207-Ci for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:04:05 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:36792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YtX4k-000203-A9 for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:04:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YtX4k-0002Kz-3N for bug-gnu-emacs@gnu.org; Sat, 16 May 2015 04:04: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 08:04: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.14317634288959 (code B ref 20292); Sat, 16 May 2015 08:04:02 +0000 Original-Received: (at 20292) by debbugs.gnu.org; 16 May 2015 08:03:48 +0000 Original-Received: from localhost ([127.0.0.1]:46767 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtX4V-0002KR-Tt for submit@debbugs.gnu.org; Sat, 16 May 2015 04:03:48 -0400 Original-Received: from mail-wi0-f170.google.com ([209.85.212.170]:36108) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YtX4U-0002KC-QY for 20292@debbugs.gnu.org; Sat, 16 May 2015 04:03:47 -0400 Original-Received: by wizk4 with SMTP id k4so17416292wiz.1 for <20292@debbugs.gnu.org>; Sat, 16 May 2015 01:03:41 -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=iUqhOo910g5OJZYfyjZ86OvvgbYG4B3SC27Li2KyaYY=; b=VrgSj+ojEG2TcII/NA8mAcjdmoTbRi+H7Y4syBPBvlj53uzg6nEezMH3s3etoae7I5 iywMuS7A8hZrbadcYF8DtEZznHEdywNAFt+i3zLVvF/yfk3LwPThaMhZLxgHnRrbTuu0 vyx9zvF1TiSdBLpxkySGLx4Z7px7V8hwc8x2XEsI+4W9z4z8zd+s7eYaC5N0XiJ6b0tC DSlUBzZajy2SOEktRUxZonqNrTIdlyPJ8Hqp+ByBG5jDb9d1XURdtIFDDd1Eybrl4aXK 3N30434+zXXhWbmQ919W4NHZN4g+3gOQrpLUXGGWaOdzZgpcrh+LDwgmmt+O1CIMgK3G mdEw== X-Received: by 10.194.71.51 with SMTP id r19mr12932011wju.74.1431763421236; Sat, 16 May 2015 01:03:41 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id o5sm2450398wia.0.2015.05.16.01.03.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 May 2015 01:03:40 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: <83bnhlgfi0.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:102869 Archived-At: 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.