rerere: recalculate conflict ID when unresolved conflict is committed
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: bd7dfa543e0263858071b8648a55ef7ccae1085b)
-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