Merge branch 'se/doc-checkout-ours-theirs' into maint
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 204ea3cad443df4f14623a09ee8201a552f067af)
-rw-r--r-- 6674 README
-rwxr-xr-x 5399 diff-highlight