Re: How to install and use a custom merge driver

From: Alec Clews <alecclews@gmail.com>
Date: Jan 28, 2009, 23:04 UTC
Message-ID: <loom.20090128T230123-889@post.gmane.org>
In-Reply-To: <20090128061848.GA19165@coredump.intra.peff.net>

Jeff King <peff <at> peff.net> writes:

Show 10 quoted lines

> 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".

Thanks Jeff

I fixed that problem -- however it did not make any difference.

Is there someway to enable logging to see how git is making this choice?

- Alec