Merge branch 'vr/git-merge-default-to-upstream'
[git] / Documentation / .gitattributes
1 *.txt whitespace