From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master b5b0e05: Call `smerge-start-session' even when dealing with a stash conflict Date: Tue, 21 Apr 2015 00:06:21 +0300 Message-ID: <55356A4D.90605@yandex.ru> References: <20150419192734.3632.17817@vcs.savannah.gnu.org> <5534FB9D.4070502@yandex.ru> <55352145.6090301@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 1429564011 16640 80.91.229.3 (20 Apr 2015 21:06:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 21:06:51 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 20 23:06:43 2015 Return-path: Envelope-to: ged-emacs-devel@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 1YkItu-0002J6-Vi for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 23:06:43 +0200 Original-Received: from localhost ([::1]:55361 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkItu-0007HO-52 for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 17:06:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkIth-0007Gi-6T for emacs-devel@gnu.org; Mon, 20 Apr 2015 17:06:30 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YkIte-00066M-Di for emacs-devel@gnu.org; Mon, 20 Apr 2015 17:06:29 -0400 Original-Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:36652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YkIte-00066B-5z for emacs-devel@gnu.org; Mon, 20 Apr 2015 17:06:26 -0400 Original-Received: by wgsk9 with SMTP id k9so192508743wgs.3 for ; Mon, 20 Apr 2015 14:06:25 -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=5Jg7mROScnLPAdltPTaVDpXei6upHbeK7cLwhM56B9U=; b=uxJFTBo2+jKzykBH2xgnoPkiNxctSwUDx5ZdE1UduESub4ot0wq0qYMRmcRmAdRO7v HxEfmDrQ2i3QQezpM0z9OefhRMvZuKemtQMq9oAvUb3au1O1pJ6wapJVsMAnX5/Qsl4s ptEPpiBvuaGsMg6Jy0oSVqpv3mV2QuFyJxS9tvqjFh9L1VCVgtOgyIcNnIAUIWqz+FOp I3hUltWI8BeDogFz9f9DlifY7KoeIk9vRu+Wi1CgtwoqD7NWf/fDbxoODPmoHdJvf1iH KfsdwoNNWW2TeEIvFw9C/Oulo0gFM2qN6LtXX+NI7D/6urMntexQBQaFjJaeTp8322/J HqbQ== X-Received: by 10.180.9.2 with SMTP id v2mr27668791wia.51.1429563985343; Mon, 20 Apr 2015 14:06:25 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id m1sm16847559wiw.7.2015.04.20.14.06.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2015 14:06:24 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:36.0) Gecko/20100101 Thunderbird/36.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c00::22c X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185734 Archived-At: On 04/20/2015 10:39 PM, Stefan Monnier wrote: > Yes, it's hideous. We should report it as a Git bug. http://thread.gmane.org/gmane.comp.version-control.git/267500