From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Strange ChangeLog entry after merge from emacs-24 Date: Sun, 07 Dec 2014 19:42:37 +0200 Message-ID: <83bnnfz78y.fsf@gnu.org> References: <83iohp18fk.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417974306 10756 80.91.229.3 (7 Dec 2014 17:45:06 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 7 Dec 2014 17:45:06 +0000 (UTC) Cc: emacs-devel@gnu.org To: monnier@iro.umontreal.ca Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 07 18:44:58 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 1XxftB-0006d9-E0 for ged-emacs-devel@m.gmane.org; Sun, 07 Dec 2014 18:44:57 +0100 Original-Received: from localhost ([::1]:58710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxftB-0002sU-2n for ged-emacs-devel@m.gmane.org; Sun, 07 Dec 2014 12:44:57 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xxfss-0002sB-08 for emacs-devel@gnu.org; Sun, 07 Dec 2014 12:44:43 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xxfsm-0003IA-Rd for emacs-devel@gnu.org; Sun, 07 Dec 2014 12:44:37 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:52792) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xxfsm-0003Hv-JQ for emacs-devel@gnu.org; Sun, 07 Dec 2014 12:44:32 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NG8006003IF2A00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Sun, 07 Dec 2014 19:42:49 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NG8005UQ3VCWU40@a-mtaout21.012.net.il>; Sun, 07 Dec 2014 19:42:49 +0200 (IST) In-reply-to: <83iohp18fk.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 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:179285 Archived-At: > Date: Sat, 06 Dec 2014 10:36:31 +0200 > From: Eli Zaretskii > CC: emacs-devel@gnu.org > > > 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?