Re: git ChangeLog merge driver

[Ralf Wildenhues]

Hi Eric,

* Eric Blake wrote on Wed, Apr 16, 2008 at 10:57:12PM CEST:
> Subject: [PATCH] Make ChangeLog merges easier.
> 
> * .gitattributes: New file.
> * HACKING: Mention how it helps.

OK, thanks!

Cheers,
Ralf