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: Strange ChangeLog entry after merge from emacs-24 Date: Sat, 06 Dec 2014 10:36:31 +0200 Message-ID: <83iohp18fk.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1417854997 22018 80.91.229.3 (6 Dec 2014 08:36:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 6 Dec 2014 08:36:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Dec 06 09:36:30 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 1XxAqr-00039s-E2 for ged-emacs-devel@m.gmane.org; Sat, 06 Dec 2014 09:36:29 +0100 Original-Received: from localhost ([::1]:53761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxAqq-0003Zg-P9 for ged-emacs-devel@m.gmane.org; Sat, 06 Dec 2014 03:36:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxAqi-0003Z8-Pn for emacs-devel@gnu.org; Sat, 06 Dec 2014 03:36:25 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XxAqc-0002al-Hs for emacs-devel@gnu.org; Sat, 06 Dec 2014 03:36:20 -0500 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:59918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XxAqc-0002aZ-9w for emacs-devel@gnu.org; Sat, 06 Dec 2014 03:36:14 -0500 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NG500A00ITU2U00@mtaout24.012.net.il> for emacs-devel@gnu.org; Sat, 06 Dec 2014 10:28:27 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NG5001N5JJFYD80@mtaout24.012.net.il>; Sat, 06 Dec 2014 10:28:27 +0200 (IST) X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 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:179111 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?