Merge branch 'sm/show-superproject-while-conflicted' into maint
[gitweb.git] / contrib / diff-highlight / t /
drwxr-xr-x   parent (dest: contrib/diff-highlight; base: 9674e7a333150d4f4a4752b25b4066bcd0406ddf)
-rw-r--r-- 482 Makefile
-rwxr-xr-x 6719 t9400-diff-highlight.sh