Merge branch 'jc/combine-diff-many-parents'
[git] / t / t9604 / cvsroot / .gitattributes
1 * -whitespace