Merge branch 'en/merge-path-collision'
[git] / t / t9601 / cvsroot / .gitattributes
1 * -whitespace