Make acl_entries work reliably.
[pspp] / .gitattributes
1 ChangeLog       merge=merge-changelog