Merge branch 'jc/maint-mergetool-style-fix' into maint-1.7.11
[git/mjg.git] / .gitattributes
blob5e98806c6cc246acef5f539ae191710a0c06ad3f
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace=indent,trail,space
3 *.sh whitespace=indent,trail,space