merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / t / diff-lib /
drwxr-xr-x   parent (dest: t; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
-rw-r--r-- 18787 COPYING
-rw-r--r-- 2163 README