merge: detect delete/modechange conflict
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 72fac66bca302dbecbe42dfa0ddc7e42db2fe567)
-rw-r--r-- 5343 README
-rwxr-xr-x 3965 diff-highlight