merge-recursive: new function for better colliding conflict resolutions
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: 37b65ce36bc8f79b5e8cf6f3addf586bd72f3352)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js