From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stephen Berman Newsgroups: gmane.emacs.devel Subject: Re: info files Date: Mon, 23 Dec 2013 18:17:20 +0100 Message-ID: <87vbyftrkv.fsf@rosalinde.fritz.box> References: <87zjnrtusr.fsf@rosalinde.fritz.box> <874n5za3xe.fsf@igel.home> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1387819058 23407 80.91.229.3 (23 Dec 2013 17:17:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 23 Dec 2013 17:17:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Dec 23 18:17:44 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 1Vv98M-00045f-8t for ged-emacs-devel@m.gmane.org; Mon, 23 Dec 2013 18:17:38 +0100 Original-Received: from localhost ([::1]:34701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv98L-0004Gy-S7 for ged-emacs-devel@m.gmane.org; Mon, 23 Dec 2013 12:17:37 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv98D-0004DX-OS for emacs-devel@gnu.org; Mon, 23 Dec 2013 12:17:35 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vv987-0006rs-4D for emacs-devel@gnu.org; Mon, 23 Dec 2013 12:17:29 -0500 Original-Received: from mout.gmx.net ([212.227.17.22]:62073) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vv986-0006nK-Qu for emacs-devel@gnu.org; Mon, 23 Dec 2013 12:17:23 -0500 Original-Received: from rosalinde.fritz.box ([89.245.84.12]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0MdnN3-1W7RtN3I8z-00Pe44 for ; Mon, 23 Dec 2013 18:17:21 +0100 In-Reply-To: <874n5za3xe.fsf@igel.home> (Andreas Schwab's message of "Mon, 23 Dec 2013 18:10:53 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) X-Provags-ID: V03:K0:D6ldE2OqDqwOSZkigV5b1Mx/zIrWuoBXGNjGOzEmgS1zhV7YG5b icQfw383lUmpj2Gm6h3Qu7VKbjZ3YnPu+WXhsjN2PNV7ByU79uP5diA3/I4mNdh+BtnsuAz +T/1bSV7v0YP9gyQ947LlOnMQRaPgidUbJEJT2Op4l2LwMc06/lidMa/gxqYWuzvHcH0FnZ YLLkpwncPCtJK16+tYWBQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 212.227.17.22 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:166788 Archived-At: On Mon, 23 Dec 2013 18:10:53 +0100 Andreas Schwab wrote: > 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. Ah, ok; thanks. (I guess it would have been more polite to just wait till I could update again, then I would have seen no conflict, but thanks for indulging my impatience.) Steve Berman