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: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 17:18:09 +0200 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> <837h9kfidh.fsf@gnu.org> <831uzsfbme.fsf@gnu.org> <83zkmgdsbj.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1305991106 10191 80.91.229.12 (21 May 2011 15:18:26 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 15:18:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 17:18:22 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QNnwb-0006p0-6D for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 17:18:21 +0200 Original-Received: from localhost ([::1]:59012 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNnwa-0008NF-94 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 11:18:20 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:55138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNnwX-0008My-C4 for emacs-devel@gnu.org; Sat, 21 May 2011 11:18:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNnwW-0005eZ-Jt for emacs-devel@gnu.org; Sat, 21 May 2011 11:18:17 -0400 Original-Received: from mail-out.m-online.net ([212.18.0.10]:52055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNnwU-0005e7-QG; Sat, 21 May 2011 11:18:14 -0400 Original-Received: from frontend1.mail.m-online.net (frontend1.mail.intern.m-online.net [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 06F69186DEFD; Sat, 21 May 2011 17:18:12 +0200 (CEST) Original-Received: from localhost (dynscan1.mnet-online.de [192.168.8.164]) by mail.m-online.net (Postfix) with ESMTP id 1D82B1C000A3; Sat, 21 May 2011 17:18:12 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Original-Received: from mail.mnet-online.de ([192.168.8.180]) by localhost (dynscan1.mail.m-online.net [192.168.8.164]) (amavisd-new, port 10024) with ESMTP id 8ntePsiNt7AS; Sat, 21 May 2011 17:18:10 +0200 (CEST) Original-Received: from igel.home (ppp-88-217-118-52.dynamic.mnet-online.de [88.217.118.52]) by mail.mnet-online.de (Postfix) with ESMTP; Sat, 21 May 2011 17:18:09 +0200 (CEST) Original-Received: by igel.home (Postfix, from userid 501) id 915DECA29C; Sat, 21 May 2011 17:18:09 +0200 (CEST) X-Yow: I FORGOT to do the DISHES!! In-Reply-To: <83zkmgdsbj.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 17:46:56 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (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.10 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:139594 Archived-At: Eli Zaretskii writes: > See admin/bzrmerge.el. See what? 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."