Merge branch 'fc/rerere-conflict-style'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 6d3c4e93d40c3a7fce3c8bdc933feeb74a6b2b08)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight