Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'
[gnulib.git] / .gitattributes
2009-08-14 Eric Blakedoc: improve git diff of texinfo files
2008-02-11 Bruno HaibleSpecify custom merge drivers.