From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#29366: gitmerge to handle NEWS better Date: Tue, 12 Dec 2017 22:06:33 -0500 Message-ID: References: <6rpo7lnkp5.fsf@fencepost.gnu.org> <87fu8g26ra.fsf@engster.org> <0gbmj4et6b.fsf@fencepost.gnu.org> <87bmj31zct.fsf@engster.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1513134435 9299 195.159.176.226 (13 Dec 2017 03:07:15 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 13 Dec 2017 03:07:15 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: 29366@debbugs.gnu.org, monnier@iro.umontreal.ca To: David Engster Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Dec 13 04:07:12 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOxO3-00020v-S1 for geb-bug-gnu-emacs@m.gmane.org; Wed, 13 Dec 2017 04:07:12 +0100 Original-Received: from localhost ([::1]:33318 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOxO6-0001nc-FG for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Dec 2017 22:07:14 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOxNv-0001nX-9z for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 22:07:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOxNu-0002rG-H5 for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 22:07:03 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50540) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eOxNu-0002rB-Cp for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 22:07:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eOxNt-0001kn-U6 for bug-gnu-emacs@gnu.org; Tue, 12 Dec 2017 22:07:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 13 Dec 2017 03:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29366 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29366-submit@debbugs.gnu.org id=B29366.15131344096719 (code B ref 29366); Wed, 13 Dec 2017 03:07:01 +0000 Original-Received: (at 29366) by debbugs.gnu.org; 13 Dec 2017 03:06:49 +0000 Original-Received: from localhost ([127.0.0.1]:59221 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOxNg-0001kI-IP for submit@debbugs.gnu.org; Tue, 12 Dec 2017 22:06:49 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:43920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOxNe-0001k5-Tv for 29366@debbugs.gnu.org; Tue, 12 Dec 2017 22:06:47 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOxNZ-0002jk-5u for 29366@debbugs.gnu.org; Tue, 12 Dec 2017 22:06:41 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOxNR-0002g0-Qc; Tue, 12 Dec 2017 22:06:33 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1eOxNR-0002eq-C5; Tue, 12 Dec 2017 22:06:33 -0500 X-Spook: Hurricane ASO Trafficking Brush fire subversive United X-Ran: !mGQ%XeS"?HXr-=0Yy;>zT4NgNC4{`]mF9%enLjHL@(x"*NoOqe3!m.<8\c0>d/7>W|S[o X-Hue: white X-Attribution: GM In-Reply-To: <87bmj31zct.fsf@engster.org> (David Engster's message of "Tue, 12 Dec 2017 21:10:42 +0100") X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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: 208.118.235.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:141016 Archived-At: David Engster wrote: > Indeed, that final commit was missing. It works for me as well. Thanks for checking.