Merge branch 'va/git-p4-branch'
[git] / Documentation / .gitattributes
1 *.txt whitespace