Merge branch 'maint-1.5.4' into maint
[git] / .gitattributes
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace