Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
[git.git] / .gitattributes
blob6b9c715d21d5486e59083fb6071566aa6ecd4d42
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace