merge-recursive: Move process_entry's content merging into a function

[git.git] / .gitattributes

* whitespace=!indent,trail,space
*.[ch] whitespace=indent,trail,space
*.sh whitespace=indent,trail,space