From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: info files Date: Mon, 23 Dec 2013 18:10:53 +0100 Message-ID: <874n5za3xe.fsf@igel.home> References: <87zjnrtusr.fsf@rosalinde.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387818670 18846 80.91.229.3 (23 Dec 2013 17:11:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Dec 2013 17:11:10 +0000 (UTC) Cc: emacs-devel@gnu.org To: Stephen Berman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 23 18:11:16 2013 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 1Vv927-00079v-0M for ged-emacs-devel@m.gmane.org; Mon, 23 Dec 2013 18:11:11 +0100 Original-Received: from localhost ([::1]:34658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv926-0000qJ-IK for ged-emacs-devel@m.gmane.org; Mon, 23 Dec 2013 12:11:10 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59078) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv91y-0000pb-0h for emacs-devel@gnu.org; Mon, 23 Dec 2013 12:11:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vv91r-0004Yr-T9 for emacs-devel@gnu.org; Mon, 23 Dec 2013 12:11:01 -0500 Original-Received: from mail-out.m-online.net ([212.18.0.9]:39159) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv91r-0004Ye-Mo for emacs-devel@gnu.org; Mon, 23 Dec 2013 12:10:55 -0500 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3dp6XH0bKSz4KKS8; Mon, 23 Dec 2013 18:10:55 +0100 (CET) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.6.68]) by mail.m-online.net (Postfix) with ESMTP id 3dp6XH0SjKzbbfn; Mon, 23 Dec 2013 18:10:55 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.6.68]) (amavisd-new, port 10024) with ESMTP id 7qvWYI_4F4m7; Mon, 23 Dec 2013 18:10:54 +0100 (CET) X-Auth-Info: a3TaKD/K671InMsuo+EHwRuxWLbD4GdnAqvNtYu2O5g= Original-Received: from igel.home (ppp-46-244-239-242.dynamic.mnet-online.de [46.244.239.242]) by mail.mnet-online.de (Postfix) with ESMTPA; Mon, 23 Dec 2013 18:10:54 +0100 (CET) Original-Received: by igel.home (Postfix, from userid 1000) id D79172C0470; Mon, 23 Dec 2013 18:10:53 +0100 (CET) X-Yow: Let's all show human CONCERN for REVEREND MOON's legal difficulties!! In-Reply-To: <87zjnrtusr.fsf@rosalinde.fritz.box> (Stephen Berman's message of "Mon, 23 Dec 2013 17:07:48 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 212.18.0.9 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:166787 Archived-At: Stephen Berman writes: > So I suppose the next time I update the branch I'll get a conflict > again No, you won't. It's now an ignored directory. Andreas. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."