cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-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