From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: David Engster Newsgroups: gmane.emacs.bugs Subject: bug#29366: gitmerge to handle NEWS better Date: Tue, 12 Dec 2017 00:18:33 +0100 Message-ID: <87fu8g26ra.fsf@engster.org> References: <6rpo7lnkp5.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1513034354 10425 195.159.176.226 (11 Dec 2017 23:19:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 11 Dec 2017 23:19:14 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3.50 (gnu/linux) Cc: 29366@debbugs.gnu.org, monnier@iro.umontreal.ca To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Dec 12 00:19:07 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 1eOXLm-0002K5-DG for geb-bug-gnu-emacs@m.gmane.org; Tue, 12 Dec 2017 00:19:06 +0100 Original-Received: from localhost ([::1]:55929 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOXLt-00055J-IC for geb-bug-gnu-emacs@m.gmane.org; Mon, 11 Dec 2017 18:19:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOXLm-00055E-8k for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:19:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOXLi-0000Eq-6I for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:19:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48732) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eOXLi-0000Ee-2B for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:19:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eOXLh-0001SR-MQ for bug-gnu-emacs@gnu.org; Mon, 11 Dec 2017 18:19:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: David Engster Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 11 Dec 2017 23:19: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.15130343225576 (code B ref 29366); Mon, 11 Dec 2017 23:19:01 +0000 Original-Received: (at 29366) by debbugs.gnu.org; 11 Dec 2017 23:18:42 +0000 Original-Received: from localhost ([127.0.0.1]:57413 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOXLO-0001Rq-Jy for submit@debbugs.gnu.org; Mon, 11 Dec 2017 18:18:42 -0500 Original-Received: from randomsample.de ([5.45.97.173]:59351) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eOXLM-0001Ri-VG for 29366@debbugs.gnu.org; Mon, 11 Dec 2017 18:18:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=ZFiaYMzKE3toC3Jt0Y9rf0nx4WgT3Ikbr9Ra86j4iYs=; b=G01imYilM0qxONsxsAusMtpapw4/uZFExyDeUUG+XJFIwU0Zpq3p2mxgbDReU/mwufwubg2/iuXumUCuzJZeyTH/swpfEgZ3I5Bc+Co/TUPfOw7S2eYT/QuGNjxv0Gfc; Original-Received: from ip4d167df7.dynamic.kabel-deutschland.de ([77.22.125.247] helo=isaac) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1eOXLK-0008Of-FB; Tue, 12 Dec 2017 00:18:38 +0100 In-Reply-To: <6rpo7lnkp5.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 11 Dec 2017 14:11:50 -0500") 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:140952 Archived-At: Hi Glenn, I'm not sure about that smerge stuff either, that was something I took over from bzrmerge. It may be that it is not functional. I hope I can make time to take a look at this in the coming days. -David