Merge branch 'jk/two-way-merge-corner-case-fix'
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 3979580265bac968c30ce203022d7a8294710909)
-rw-r--r-- 5343 README
-rwxr-xr-x 3811 diff-highlight