merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-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