merge-one-file: force content conflict for "both sides added" case
[git] / t / .gitignore
1 /trash directory*
2 /test-results
3 /.prove