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: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 18:51:33 +0300 Message-ID: <83wrhkdpbu.fsf@gnu.org> References: <83ipt4fqyy.fsf@gnu.org> <837h9kfidh.fsf@gnu.org> <831uzsfbme.fsf@gnu.org> <83zkmgdsbj.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1305993106 20332 80.91.229.12 (21 May 2011 15:51:46 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 15:51:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 17:51:42 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 1QNoSr-0004RE-T8 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 17:51:42 +0200 Original-Received: from localhost ([::1]:60806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNoSr-0004Jq-95 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 11:51:41 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:58929) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNoSp-0004Jl-6s for emacs-devel@gnu.org; Sat, 21 May 2011 11:51:40 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNoSo-0001wf-4o for emacs-devel@gnu.org; Sat, 21 May 2011 11:51:39 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:60876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNoSn-0001wZ-TR for emacs-devel@gnu.org; Sat, 21 May 2011 11:51:38 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0LLJ00700YFX9U00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Sat, 21 May 2011 18:51:35 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.124.254.13]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0LLJ006YXYPSND90@a-mtaout20.012.net.il>; Sat, 21 May 2011 18:51:29 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:139595 Archived-At: > From: Andreas Schwab > Date: Sat, 21 May 2011 17:18:09 +0200 > Cc: emacs-devel@gnu.org > > Eli Zaretskii writes: > > > See admin/bzrmerge.el. > > See what? The answer to your question.