Merge branch 'jn/merge-no-edit-fix'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 5cdc9fbb0894023da8e4dab552dfdda8b662feab)
-rw-r--r-- 2519 README
-rwxr-xr-x 2583 diff-highlight