Re: How to install and use a custom merge driver

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

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

quoted

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