Merge branch 'mm/status-suggest-merge-abort' into maint
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 61efc5c2d81cbd8c9a5d145e1aab2f744772c856)
-rw-r--r-- 6674 README
-rwxr-xr-x 5399 diff-highlight