Second attempt to work around an AIX 5.3, 6.1 compiler bug with include_next.
[pspp] / .gitattributes
1 ChangeLog       merge=merge-changelog