Merge branch 'jk/rebase-i-submodule-conflict-only'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 1f643446598c3727b506a46d88f734b13e90dc77)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight