Merge branch 'ma/fast-export-skip-merge-fix'
[git] / t / .gitignore
1 /trash directory*
2 /test-results
3 /.prove