Merge branch 'en/merge-fixes'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 10b8084ee1be90227dff570fee8a57d183e7ae07)
-rw-r--r-- 6674 README
-rwxr-xr-x 5399 diff-highlight