Merge branch 'jk/patch-ids-no-merges'
[git] / contrib / diff-highlight / t / .gitignore
1 /trash directory*
2 /test-results