Merge branch 'jk/two-way-merge-corner-case-fix' into maint
[git] / t / t9604 / cvsroot / .gitattributes
1 * -whitespace