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