Merge branch 'dp/merge-strategy-doc-fix' into next
[gitweb.git] / contrib / diff-highlight / t /
drwxr-xr-x   parent (dest: contrib/diff-highlight; base: 317e077588bd945c6bd29d5ead554f6be2a262c0)
-rw-r--r-- 482 Makefile
-rwxr-xr-x 5696 t9400-diff-highlight.sh