Merge branch 'en/d-f-conflict-fix'
[git] / t / .gitignore
1 /trash directory*
2 /test-results
3 /.prove