Re: [RFC] Introduce git-xxdiff to invoke xxdiff for manual conflict resolution - take 2

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Aug 5, 2006, 03:26 UTC
Message-ID: <46a038f90608042026l732cef04u46df9b3429cd04d4@mail.gmail.com>
In-Reply-To: <81b0412b0608040109q683bd628rd9238662e0fdfb0@mail.gmail.com>

On 8/4/06, Alex Riesen <raa.lkml@gmail.com> wrote:

Show 6 quoted lines

> 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?

Well, the xx part is taken because it uses xxdiff, so I thought perhaps we can have trivial git wrappers for many popular mergers. Ie: git-wiggle, git-sdiff.

We could have a single command with a 'strategy' parameter, say

     git-mergehelper -s [xxdiff|sdiff|wiggle] path/to/file

but separate commands are easier for prototyping IMVHO.

cheers,

martin