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