From: Nix <nix@esperi.org.uk>
Date: Wed, 25 Jul 2007 22:43:44 GMT
Subject: Re: [RFC PATCH] Re: Empty directories...
Message-ID: <877iooxfxb.fsf@hades.wkstn.nix>
In-Reply-To: <f83bfv$95g$1@sea.gmane.org>

On 23 Jul 2007, Jakub Narebski spake thusly:

> Nix wrote:
>
>> And the problem is that while git has a lot of strategies for merging
>> *trees*, its file merge system is totally unpluggable: it just falls
>> back to xdiff's merging system. I guess I'll have to add that feature :)
>
> Not true. You can add custom diff driver for files using gitattributes
> system.

Oo. Excellent, I didn't notice that. Thank you.