Fix problems with overloaded C++ definitions of memchr, strpbrk, etc.
[pspp] / .gitattributes
2009-08-14 Eric Blakedoc: improve git diff of texinfo files
2008-02-11 Bruno HaibleSpecify custom merge drivers.