Merge branch 'jc/maint-mergetool-style-fix'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 4052719f6dde13c85ddb2f25ee647506bdc7868b)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight