From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#22733: 24.5; smerge-keep-current incorrectly edits conflict at end of file Date: Thu, 01 Aug 2019 15:19:42 +0200 Message-ID: <87r265kopd.fsf@mouse.gnus.org> References: <56C5BD4B.3020403@schibsted.com> <87lfwdm532.fsf@mouse.gnus.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="23444"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) To: 22733@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Aug 01 15:20:11 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1htB07-0005zI-Ji for geb-bug-gnu-emacs@m.gmane.org; Thu, 01 Aug 2019 15:20:11 +0200 Original-Received: from localhost ([::1]:55878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htB06-0000Ab-LX for geb-bug-gnu-emacs@m.gmane.org; Thu, 01 Aug 2019 09:20:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:60653) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1htAzz-00008K-Nt for bug-gnu-emacs@gnu.org; Thu, 01 Aug 2019 09:20:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1htAzy-0007Tg-Ia for bug-gnu-emacs@gnu.org; Thu, 01 Aug 2019 09:20:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1htAzy-0007TV-FE for bug-gnu-emacs@gnu.org; Thu, 01 Aug 2019 09:20:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1htAzy-0000eC-8x for bug-gnu-emacs@gnu.org; Thu, 01 Aug 2019 09:20:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 01 Aug 2019 13:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22733 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 22733-submit@debbugs.gnu.org id=B22733.15646655892451 (code B ref 22733); Thu, 01 Aug 2019 13:20:02 +0000 Original-Received: (at 22733) by debbugs.gnu.org; 1 Aug 2019 13:19:49 +0000 Original-Received: from localhost ([127.0.0.1]:53683 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1htAzk-0000dT-K1 for submit@debbugs.gnu.org; Thu, 01 Aug 2019 09:19:48 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:39822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1htAzi-0000dK-6g for 22733@debbugs.gnu.org; Thu, 01 Aug 2019 09:19:46 -0400 Original-Received: from 77.18.62.220.tmi.telenormobil.no ([77.18.62.220] helo=sandy) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1htAze-000746-N5 for 22733@debbugs.gnu.org; Thu, 01 Aug 2019 15:19:44 +0200 In-Reply-To: <87lfwdm532.fsf@mouse.gnus.org> (Lars Ingebrigtsen's message of "Thu, 01 Aug 2019 14:40:33 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.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" Xref: news.gmane.org gmane.emacs.bugs:164221 Archived-At: The mail bounced, so I think it's unlikely to get any progress on this bug report, and I'm closing it. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no