From mboxrd@z Thu Jan  1 00:00:00 1970
From: iru.muzgo@gmail.com (=?UTF-8?Q?Iruat=C3=A3_Souza?=)
Date: Wed, 16 Mar 2011 18:30:12 -0300
Subject: [9fans] anybody figured out a way to use acme as graphical
 merging tool for hg?
In-Reply-To: <1388b4f5f7815a0a4684b12a5b647217@smgl.homelinux.net>
References: <AANLkTikNFJLvE=cPme-93GvPSCWFLuEt5e2Y8Gk_8b6y@mail.gmail.com>
	<1388b4f5f7815a0a4684b12a5b647217@smgl.homelinux.net>
Message-ID: <AANLkTimtCO=UwntxJ-hoTBGXpeUrsEo8p_=b_LjKV0t8@mail.gmail.com>
Topicbox-Message-UUID: bbb5ac76-ead6-11e9-9d60-3106f5b1d025

adiff may be a good place to look at too.

On Wed, Mar 16, 2011 at 11:27 AM, Mathieu Lonjaret
<mathieu.lonjaret at gmail.com> wrote:
> Hello,
>
> Maybe that would help, as a starting point?
>
> http://9fans.net/archive/2009/06/138
>
> mathieu
>
>
> ---------- Forwarded message ----------
> From:?Fernan Bolando <fernanbolando at mailc.net>
> To:?Fans of the OS Plan 9 from Bell Labs <9fans at 9fans.net>
> Date:?Wed, 16 Mar 2011 14:14:15 +0800
> Subject:?[9fans] anybody figured out a way to use acme as graphical merging tool for hg?
> Hi all
>
> As I believe there a few hg users here. I was wondering if anybody has
> a way to use acme to resolve merge conflicts by showing the diffs in
> different panes.
>
> fernan
>
>