On 8/4/06, Alex Riesen <raa.lkml@xxxxxxxxx> wrote:
On 8/4/06, Martin Langhoff <martin@xxxxxxxxxxxxxxx> 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
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html