merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
-rw-r--r-- 46851 Git.pm
drwxr-xr-x - Git
-rw-r--r-- 2286 Makefile
-rw-r--r-- 1598 Makefile.PL
-rw-r--r-- 19087 private-Error.pm