merge-recursive: check for file level conflicts then get new name
[gitweb.git] / contrib / diff-highlight / t /
drwxr-xr-x   parent (dest: contrib/diff-highlight; base: f6f775591881036a3c4bfcf6737c9119c251537d)
-rw-r--r-- 482 Makefile
-rwxr-xr-x 6719 t9400-diff-highlight.sh