Merge branch 'jc/merge-x-theirs-docfix'
[git] / contrib / workdir / .gitattributes
1 /git-new-workdir eol=lf