Merge branch 'en/dirty-merge-fixes'
[gitweb.git] / contrib / diff-highlight / t /
drwxr-xr-x   parent (dest: contrib/diff-highlight; base: c18ac30e9ebcf7b7e2fbd992744e63c71089a12a)
-rw-r--r-- 482 Makefile
-rwxr-xr-x 6719 t9400-diff-highlight.sh