am -3: do not let failed merge from completing the error codepath
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: c63d4b2)
-rw-r--r-- 6674 README
-rwxr-xr-x 5399 diff-highlight