From: Jeff King <peff@peff.net>
Date: Wed, 28 Jan 2009 06:18:48 GMT
Subject: Re: How to install and use a custom merge driver
Message-ID: <20090128061848.GA19165@coredump.intra.peff.net>
In-Reply-To: <497FCC9A.9080008@gmail.com>

On Wed, Jan 28, 2009 at 02:10:18PM +1100, Alec Clews wrote:

> Setup:
>
> I have set up my ..git/info/gitattributes as follows
>
> *      merge=overwrite

Your setup looks right, except that the correct file is
".git/info/attributes".

-Peff