Merge branch 'en/merge-recursive' into next
[git] / t / t9601 / cvsroot / .gitattributes
1 * -whitespace