Avoid conflicts between local macro definitions.
[pspp] / .gitattributes
1 ChangeLog       merge=merge-changelog