From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Fri, 26 Jun 2009 12:04:59 GMT
Subject: Re: Choosing a mergetool according to file type
Message-ID: <vpqd48rw68k.fsf@bauges.imag.fr>
In-Reply-To: <C66A69E6.205F2%jefferis@gmail.com>

Gregory Jefferis <jefferis@gmail.com> writes:

> Hi Johannes,
>
> On 2009-06-26 11:43, "Johannes Sixt" <j.sixt@viscovery.net> wrote:
>
>> I don't think that you can choose the merge tool by setting attributes.
>
> OK, that was my impression, but I wanted to check.

Never used it, but man gitattributes says

   Performing a three-way merge
       merge
[...]
              String
                 3-way merge is performed using the specified custom merge driver. The built-in 3-way merge driver can be explicitly specified by asking
                 for "text" driver; the built-in "take the current branch" driver can be requested with "binary".
[...]
       Defining a custom merge driver

Is it not what you're looking for?

-- 
Matthieu