Make acl_entries work reliably.
[pspp] / .gitattributes
2008-02-11 Bruno HaibleSpecify custom merge drivers.