Merge branch 'rt/cherry-revert-conflict-summary' into maint
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: a28b919f05ed29cd9e6615179bd56edde50c6b63)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight