Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 216d29ef257e48f95bc14765d5da17e7854a3109)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight