Merge branch 'jc/merge-x-theirs-docfix'
[git] / contrib / mw-to-git / t / .gitignore
1 WEB/
2 wiki/
3 trash directory.t*/
4 test-results/