From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Sun, 25 Mar 2007 23:34:29 GMT
Subject: Re: merge strategy request
Message-ID: <46a038f90703251634t2ab6a455t382ebe29cdb53667@mail.gmail.com>
In-Reply-To: <7v648paj14.fsf@assigned-by-dhcp.cox.net>

On 3/25/07, Junio C Hamano <junkio@cox.net> wrote:
> Right.  In the current system, git-mergetool might be a better
> place to add support for special perpose 3-version file-level
> merge backend than merge-recursive, at least until gitattributes
> materializes.

Would it be possible to have an env var (GIT_MERGE) that can be used
to call an arbitrary script with merge/diff3 semantics instead of
using the internal 3-way merge? That way we could do syntax-specific
merges (ignore comments/whitespace, for example).

i would surely have a use for it, as sometimes my internal team is not
_that_ good about trimming whitespace, and we have merges that succeed
except for their whitespace conflicts.

cheers,



martin