Merge branch 'rs/merge-tree-simplify'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 7669461459aaee1587bac77c4a446e9365b582c7)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight