Add new test case to ensure git-merge reduces octopus parents when possible

[git.git] / .gitattributes

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