Merge branch 'js/difftool-builtin'
[git] / Documentation / .gitattributes
1 *.txt whitespace