merge-recursive: Avoid doubly merging rename/add conflict contents
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 2a669c341a857f53d946dec762e6f22a54b12dd2)
-rw-r--r-- 10626 INSTALL
-rw-r--r-- 4498 Makefile
-rw-r--r-- 22109 README
-rwxr-xr-x 211032 gitweb.perl
drwxr-xr-x - static