Merge branch 'da/mergetool-winmerge'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: a225a2601014bf06ddba932c9dab6cc299ab5239)
-rw-r--r-- 6674 README
-rwxr-xr-x 5399 diff-highlight