Merge branch 'dl/apply-3way-diff3'
[git] / contrib / diff-highlight / .gitignore
1 shebang.perl
2 diff-highlight