merge-file: correctly open files when in a subdir
[git] / t / .gitignore
1 /trash directory*
2 /test-results
3 /.prove