Second attempt to work around an AIX 5.3, 6.1 compiler bug with include_next.
[pspp] / .gitattributes
2008-02-11 Bruno HaibleSpecify custom merge drivers.