merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / contrib / diff-highlight /
drwxr-xr-x   parent (dest: contrib; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
-rw-r--r-- 45 Makefile
-rw-r--r-- 6674 README
-rwxr-xr-x 5788 diff-highlight
drwxr-xr-x - t