Merge branch 'jk/two-way-merge-corner-case-fix'
[git] / Documentation / .gitattributes
1 *.txt whitespace