cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / contrib / diff-highlight / t /
drwxr-xr-x   parent (dest: contrib/diff-highlight; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-rw-r--r-- 482 Makefile
-rwxr-xr-x 6719 t9400-diff-highlight.sh