Gregory Jefferis <jefferis@xxxxxxxxx> writes:
> Hi Johannes,
>
> On 2009-06-26 11:43, "Johannes Sixt" <j.sixt@xxxxxxxxxxxxx> 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
--
To unsubscribe from this list: 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