merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / contrib / diff-highlight / t /
drwxr-xr-x   parent (dest: contrib/diff-highlight; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 482 Makefile
-rwxr-xr-x 6719 t9400-diff-highlight.sh