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: bzr commit raises a weird conflict Date: Fri, 12 Apr 2013 10:49:48 +0200 Message-ID: <87mwt4b0b7.fsf@bzg.ath.cx> References: <87txngta6a.fsf@bzg.ath.cx> <87zjx8hz7b@ch.ristopher.com> <8338uzbuu5.fsf@gnu.org> <87zjx6sumu@ch.ristopher.com> <83ip3u9zcf.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1365756602 13412 80.91.229.3 (12 Apr 2013 08:50:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 12 Apr 2013 08:50:02 +0000 (UTC) Cc: Christopher Schmidt , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 12 10:50:06 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 1UQZgJ-0006IE-3d for ged-emacs-devel@m.gmane.org; Fri, 12 Apr 2013 10:50:03 +0200 Original-Received: from localhost ([::1]:41248 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQZgI-0004d1-Nv for ged-emacs-devel@m.gmane.org; Fri, 12 Apr 2013 04:50:02 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQZgE-0004cn-HY for emacs-devel@gnu.org; Fri, 12 Apr 2013 04:49:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQZgD-0008NW-7U for emacs-devel@gnu.org; Fri, 12 Apr 2013 04:49:58 -0400 Original-Received: from mail-wg0-f44.google.com ([74.125.82.44]:37647) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQZgB-0008Mu-RY; Fri, 12 Apr 2013 04:49:55 -0400 Original-Received: by mail-wg0-f44.google.com with SMTP id z11so2457257wgg.35 for ; Fri, 12 Apr 2013 01:49:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:in-reply-to:references :user-agent:date:message-id:mime-version:content-type; bh=ZBsWd/whfcCI2EceG+bQPFU0fIH/cQZZr8+y/t8k9Bw=; b=yRumH2kSvnU5F4RVqozlJPWhMvxx5heeGacugo/noXBN7/FYc3ylAnOovyqllYcY9x 5j1W5iHdKR2yJkE+ruJUBTV04lc911/Ha6++AigU27eFJ8Icky8b3BtKoBr8aeVaT31j ufsalnRE2FnoIIU+Iz8Wmgfi5XG6f7vnA/SQ6Gx0dLBa2EetJIVR15Ou6fgvInxkN+O1 ICDoIbRfva8xWF8cFMCMSMXCtg0ju7m5elz1Vtn24HUyQkFyXj6AozLPky8+PgiyrzK1 oUZ3rZoClINHpFJQ+xAjw4bflbjbXSpVvyUwxSSgIbCkYEXivgdqadz1DuaqWVbLayDf EB0A== X-Received: by 10.180.13.233 with SMTP id k9mr2509993wic.6.1365756594991; Fri, 12 Apr 2013 01:49:54 -0700 (PDT) Original-Received: from bzg.localdomain (static-qvn-qvo-249016.business.bouyguestelecom.com. [89.91.249.16]) by mx.google.com with ESMTPS id fv2sm2191837wib.6.2013.04.12.01.49.49 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 12 Apr 2013 01:49:53 -0700 (PDT) Original-Received: by bzg.localdomain (Postfix, from userid 1000) id AA83F1C22210; Fri, 12 Apr 2013 10:49:48 +0200 (CEST) In-Reply-To: <83ip3u9zcf.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 10 Apr 2013 18:31:28 +0300") User-Agent: Gnus/5.130006 (Ma Gnus v0.6) Emacs/24.3.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.82.44 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:158849 Archived-At: Eli Zaretskii writes: > It was not noise: you helped Bastien to solve his problem. No need to > apologize for that. Indeed, no apologies needed -- thanks all for the info. -- Bastien