From: Alex Riesen <raa.lkml@gmail.com>
Date: Fri, 04 Aug 2006 08:09:36 GMT
Subject: Re: [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution - take 2
Message-ID: <81b0412b0608040109q683bd628rd9238662e0fdfb0@mail.gmail.com>
In-Reply-To: <11546518271379-git-send-email-martin@catalyst.net.nz>

On 8/4/06, Martin Langhoff <martin@catalyst.net.nz> wrote:
> This is a bit of a crude but really useful shortcut for conflict resolution.
> The name is bad, but git-merge-* is a different 'namespace', and git-resolve is
> also taken.

git-xxmerge?