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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
