From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Strange ChangeLog entry after merge from emacs-24 Date: Sun, 07 Dec 2014 16:18:04 -0500 Message-ID: References: <83iohp18fk.fsf@gnu.org> <83bnnfz78y.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417987122 6803 80.91.229.3 (7 Dec 2014 21:18:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 7 Dec 2014 21:18:42 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 07 22:18:35 2014 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 1XxjDv-0004Tf-IX for ged-emacs-devel@m.gmane.org; Sun, 07 Dec 2014 22:18:35 +0100 Original-Received: from localhost ([::1]:59192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxjDv-0004NF-3O for ged-emacs-devel@m.gmane.org; Sun, 07 Dec 2014 16:18:35 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37115) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxjDb-0004MZ-W4 for emacs-devel@gnu.org; Sun, 07 Dec 2014 16:18:21 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XxjDW-0003nT-R7 for emacs-devel@gnu.org; Sun, 07 Dec 2014 16:18:15 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.181]:26628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxjDR-0003lq-58; Sun, 07 Dec 2014 16:18:05 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Am4PAOwQflRMCqTq/2dsb2JhbABbgweBK4I1hVrFHQQCAoEkFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNJBOINwnWWQEBAQcBAQEBHpBvB4RIBYsBpC6BeIQZITCCRwEBAQ X-IPAS-Result: Am4PAOwQflRMCqTq/2dsb2JhbABbgweBK4I1hVrFHQQCAoEkFwEBAQEBAXyEAwEBAwFWIwULCzQSFBgNJBOINwnWWQEBAQcBAQEBHpBvB4RIBYsBpC6BeIQZITCCRwEBAQ X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="99808563" Original-Received: from 76-10-164-234.dsl.teksavvy.com (HELO pastel.home) ([76.10.164.234]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 07 Dec 2014 16:18:04 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id 87EC99896; Sun, 7 Dec 2014 16:18:04 -0500 (EST) In-Reply-To: <83bnnfz78y.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 07 Dec 2014 19:42:37 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 206.248.154.181 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:179304 Archived-At: >> 2014-12-05 Paul Eggert >> 2014-12-05 Eli Zaretskii >> >> * .gitignore: Ignore test/biditest.txt. >> >> What happened here? Not that it was a significant contribution for >> which I'd object sharing the credit with Paul, but there might be a >> larger merging problem hiding behind this. >> >> What am I missing? > Ping! > Should I fix that entry and forget about this? I think so, yes. Stefan