From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Merge conflict cookie in dired.el (current HEAD in bzr) Date: Fri, 28 Sep 2012 00:56:50 +0200 Message-ID: <87d317rs5p.fsf@bzg.ath.cx> References: <87ehln6s9l.fsf@bzg.ath.cx> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1348786615 10797 80.91.229.3 (27 Sep 2012 22:56:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 27 Sep 2012 22:56:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Sep 28 00:56:58 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 1THN0q-0003mJ-Ux for ged-emacs-devel@m.gmane.org; Fri, 28 Sep 2012 00:56:57 +0200 Original-Received: from localhost ([::1]:48264 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THN0l-0001iq-TB for ged-emacs-devel@m.gmane.org; Thu, 27 Sep 2012 18:56:51 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THN0i-0001iW-Vk for emacs-devel@gnu.org; Thu, 27 Sep 2012 18:56:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THN0i-0000NJ-1s for emacs-devel@gnu.org; Thu, 27 Sep 2012 18:56:48 -0400 Original-Received: from mail-wg0-f49.google.com ([74.125.82.49]:34300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THN0h-0000NB-Rc; Thu, 27 Sep 2012 18:56:47 -0400 Original-Received: by wgbgg4 with SMTP id gg4so686402wgb.30 for ; Thu, 27 Sep 2012 15:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=RigGJmIYS8B2xr6QFbTHlPV0BZDMZ4ClOIt+SBuMdjw=; b=U+K1LOogwj8xUNQQXrIFV5pqQzZeQ2wYc8paHee6EJR5dneVE/YJW2BR8645e3kb1/ xii5SyLhABaOdazZL+MZAo3jeK2ogaIsPSKvFuFQbDw/EWpZOcmU1ZLrWE4tMVh4gguh 9Kpv5czgOON9l5yTwGEZh2L3Omg5+OtO/Rs/YXmZUQKsVJIVB3q+uLoLiuCyK6xYnn9I QiYPYnGaXnJPQEoWbusvB47C5dY06yVVZmdFVhOba4/fbSzfbBCQ0q1VGLqvYAbIUaKF VTYUSfUXE817ZRAzpk9qsyAbFBmDHj1ZPE8uz8F/7IEa6wBVw4NVCoSJrQL2+umI1zPd 94NA== Original-Received: by 10.216.150.197 with SMTP id z47mr2226254wej.221.1348786606457; Thu, 27 Sep 2012 15:56:46 -0700 (PDT) Original-Received: from bzg.localdomain (mar75-2-81-56-68-112.fbx.proxad.net. [81.56.68.112]) by mx.google.com with ESMTPS id k2sm15796092wiz.7.2012.09.27.15.56.44 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 15:56:45 -0700 (PDT) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id 9911B22EDA; Fri, 28 Sep 2012 00:56:50 +0200 (CEST) In-Reply-To: (Glenn Morris's message of "Thu, 27 Sep 2012 18:19:48 -0400") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.49 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:153650 Archived-At: Glenn Morris writes: > Bastien wrote: > >> There is this merge conflict indication in dired.el >> which prevents Emacs from building: > > That is local to your copy. Indeed. No idea how this ended up here. > bzr revert lisp/dired.el Done. I could install the latest Emacs fine. Thanks, -- Bastien