From: iru.muzgo@gmail.com (Iruatã Souza)
Subject: [9fans] anybody figured out a way to use acme as graphical merging tool for hg?
Date: Wed, 16 Mar 2011 18:30:12 -0300 [thread overview]
Message-ID: <AANLkTimtCO=UwntxJ-hoTBGXpeUrsEo8p_=b_LjKV0t8@mail.gmail.com> (raw)
In-Reply-To: <1388b4f5f7815a0a4684b12a5b647217@smgl.homelinux.net>
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
>
>
next prev parent reply other threads:[~2011-03-16 21:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-16 6:14 Fernan Bolando
2011-03-16 14:27 ` Mathieu Lonjaret
2011-03-16 21:30 ` Iruatã Souza [this message]
2011-03-17 13:39 ` Anthony Sorace
2011-03-16 15:02 ` dexen deVries
2011-03-16 21:03 ` Steve Simon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='AANLkTimtCO=UwntxJ-hoTBGXpeUrsEo8p_=b_LjKV0t8@mail.gmail.com' \
--to=iru.muzgo@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).