merge-recursive: remove ren[12]_other fields from rename_conflict_info
[gitweb.git] / gitweb / static /
drwxr-xr-x   parent (dest: gitweb; base: 3f9c92ec99222515c6ebac1dc12d0bc3a6d4ae08)
-rw-r--r-- 115 git-favicon.png
-rw-r--r-- 207 git-logo.png
-rw-r--r-- 10637 gitweb.css
drwxr-xr-x - js