cherry-pick/revert: make direct internal call to merge_tree()
[git/mjg.git] / .gitattributes
blob6b9c715d21d5486e59083fb6071566aa6ecd4d42
1 * whitespace=!indent,trail,space
2 *.[ch] whitespace