Merge branch 'jc/remove-treesame-parent-in-simplify-merges'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 436b60ce7aac4cf8e496c57c9baae46094571b22)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight