Avoid conflicts between local macro definitions.
[pspp] / .gitattributes
2008-02-11 Bruno HaibleSpecify custom merge drivers.