From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bzr commit raises a weird conflict Date: Wed, 10 Apr 2013 18:31:28 +0300 Message-ID: <83ip3u9zcf.fsf@gnu.org> References: <87txngta6a.fsf@bzg.ath.cx> <87zjx8hz7b@ch.ristopher.com> <8338uzbuu5.fsf@gnu.org> <87zjx6sumu@ch.ristopher.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1365607898 677 80.91.229.3 (10 Apr 2013 15:31:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 10 Apr 2013 15:31:38 +0000 (UTC) Cc: emacs-devel@gnu.org To: Christopher Schmidt Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 10 17:31:41 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 1UPwzr-0006Zx-EB for ged-emacs-devel@m.gmane.org; Wed, 10 Apr 2013 17:31:39 +0200 Original-Received: from localhost ([::1]:50843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPwzq-0003v0-Oy for ged-emacs-devel@m.gmane.org; Wed, 10 Apr 2013 11:31:38 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:37658) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPwzn-0003sc-2z for emacs-devel@gnu.org; Wed, 10 Apr 2013 11:31:36 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UPwzl-0007gY-Jx for emacs-devel@gnu.org; Wed, 10 Apr 2013 11:31:35 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:41704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UPwzl-0007fX-BQ for emacs-devel@gnu.org; Wed, 10 Apr 2013 11:31:33 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0ML100C00PR4HV00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Wed, 10 Apr 2013 18:31:13 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0ML100C6QPS1FZ20@a-mtaout20.012.net.il>; Wed, 10 Apr 2013 18:31:13 +0300 (IDT) In-reply-to: <87zjx6sumu@ch.ristopher.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:158822 Archived-At: > From: Christopher Schmidt > Date: Wed, 10 Apr 2013 08:38:19 +0100 (BST) > > thank you very much for your explanation. I should have investigated > before calling in another bug. I will be more careful next time. > > My apologies for the noise. It was not noise: you helped Bastien to solve his problem. No need to apologize for that.