Merge branch 'dp/merge-strategy-doc-fix' into next
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 317e077588bd945c6bd29d5ead554f6be2a262c0)
-rw-r--r-- 5865 DiffHighlight.pm
-rw-r--r-- 395 Makefile
-rw-r--r-- 8008 README
-rw-r--r-- 211 diff-highlight.perl
drwxr-xr-x - t