ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: d694a17986a28bbc19e2a6c32404ca24572e400f)
-rw-r--r-- 6674 README
-rwxr-xr-x 5399 diff-highlight