Re: How to install and use a custom merge driver
From: Jeff King <hidden>
Date: 2016-06-15 22:46:03
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