merge-strategies: avoid implying that "-s theirs" exists
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: c25d98b2a730cbc63033ba3360df2519d43a40cd)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js