Merge branch 'jc/merge-symlink-ours-theirs'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 14b9d9aa0d2fc6fd81d7a392fc1cc951a9d9d115)
-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