From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.org!not-for-mail
From: Richard Stallman <rms@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: merge conlict?
Date: Mon, 25 Jan 2010 19:05:20 -0500
Message-ID: <E1NZYvo-0004AP-LD@fencepost.gnu.org>
References: <E1NZJ1t-00089o-ST@monty-python.gnu.org> <83vdeq634g.fsf@gnu.org>
	<87sk9ufmgd.fsf@mithlond.arda>
Reply-To: rms@gnu.org
NNTP-Posting-Host: lo.gmane.org
Content-Type: text/plain; charset=ISO-8859-15
X-Trace: ger.gmane.org 1264464435 14123 80.91.229.12 (26 Jan 2010 00:07:15 GMT)
X-Complaints-To: usenet@ger.gmane.org
NNTP-Posting-Date: Tue, 26 Jan 2010 00:07:15 +0000 (UTC)
Cc: eliz@gnu.org, mhershberger@intrahealth.org, emacs-devel@gnu.org
To: Teemu Likonen <tlikonen@iki.fi>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 26 01:07:07 2010
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org>
Envelope-to: ged-emacs-devel@m.gmane.org
Original-Received: from lists.gnu.org ([199.232.76.165])
	by lo.gmane.org with esmtp (Exim 4.50)
	id 1NZYxW-0004Te-47
	for ged-emacs-devel@m.gmane.org; Tue, 26 Jan 2010 01:07:06 +0100
Original-Received: from localhost ([127.0.0.1]:59486 helo=lists.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43)
	id 1NZYxW-0007xe-VQ
	for ged-emacs-devel@m.gmane.org; Mon, 25 Jan 2010 19:07:07 -0500
Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NZYvu-0007LF-Fg
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:26 -0500
Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NZYvq-0007Ip-FY
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:26 -0500
Original-Received: from [199.232.76.173] (port=57499 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NZYvq-0007Ih-A5
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:22 -0500
Original-Received: from fencepost.gnu.org ([140.186.70.10]:50986)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <rms@gnu.org>) id 1NZYvp-0008Kp-E5
	for emacs-devel@gnu.org; Mon, 25 Jan 2010 19:05:21 -0500
Original-Received: from rms by fencepost.gnu.org with local (Exim 4.69)
	(envelope-from <rms@gnu.org>)
	id 1NZYvo-0004AP-LD; Mon, 25 Jan 2010 19:05:20 -0500
In-reply-to: <87sk9ufmgd.fsf@mithlond.arda> (message from Teemu Likonen on
	Mon, 25 Jan 2010 13:33:38 +0200)
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-devel>,
	<mailto:emacs-devel-request@gnu.org?subject=subscribe>
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org
Xref: news.gmane.org gmane.emacs.devel:120407
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/120407>

    It would probably help if Bazaar supported combined diff format. With
    Git we can trivially see the actual changes introduced by the merge
    commit:

Could you please report that request to the Bazaar developers?