Fix previous patch, and tweak references to $0.
[pspp] / .gitattributes
1 ChangeLog       merge=merge-changelog