adiff may be a good place to look at too.
On Wed, Mar 16, 2011 at 11:27 AM, Mathieu Lonjaret
<mathieu.lonja...@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 <fernanbola...@mailc.net>
> To: Fans of the OS Plan 9 from Bell Labs <9fans@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
>
>
