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: Merge conflict cookie in dired.el (current HEAD in bzr) Date: Fri, 28 Sep 2012 12:02:12 +0200 Message-ID: References: <87ehln6s9l.fsf@bzg.ath.cx> <87d317rs5p.fsf@bzg.ath.cx> <83ehlmhak0.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1348826576 5256 80.91.229.3 (28 Sep 2012 10:02:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 28 Sep 2012 10:02:56 +0000 (UTC) Cc: Bastien , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 28 12:02:57 2012 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 1THXPN-0001xX-0O for ged-emacs-devel@m.gmane.org; Fri, 28 Sep 2012 12:02:57 +0200 Original-Received: from localhost ([::1]:41071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THXPH-0008MB-SQ for ged-emacs-devel@m.gmane.org; Fri, 28 Sep 2012 06:02:51 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:52971) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THXPA-0008Lw-7j for emacs-devel@gnu.org; Fri, 28 Sep 2012 06:02:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THXP6-0002IC-BJ for emacs-devel@gnu.org; Fri, 28 Sep 2012 06:02:44 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.9]:37770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THXOp-00024Y-8E; Fri, 28 Sep 2012 06:02:23 -0400 Original-Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 3XSpMn3TTTz4KKBD; Fri, 28 Sep 2012 12:02:13 +0200 (CEST) X-Auth-Info: eFmt1jIXWlsO/fGs+k/ss30LJUWazyLpq5DAVqkhNB4= Original-Received: from igel.home (ppp-93-104-135-221.dynamic.mnet-online.de [93.104.135.221]) by mail.mnet-online.de (Postfix) with ESMTPA id 3XSpMn2wD5zbcBc; Fri, 28 Sep 2012 12:02:13 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id DD469CA2A3; Fri, 28 Sep 2012 12:02:12 +0200 (CEST) X-Yow: I'm changing the CHANNEL.. But all I get is commercials for ``RONCO MIRACLE BAMBOO STEAMERS''! In-Reply-To: <83ehlmhak0.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 28 Sep 2012 09:27:11 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:153668 Archived-At: Eli Zaretskii writes: > If some of them did, either commit those files (preferred), Glenn already does that, automagically. 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."