Merge branch 'jk/complete-merge-pull'
[git] / Documentation / .gitattributes
1 *.txt whitespace