merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 6947 DiffHighlight.pm
-rw-r--r-- 395 Makefile
-rw-r--r-- 8008 README
-rw-r--r-- 211 diff-highlight.perl
drwxr-xr-x - t