merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: b26d87f2da22a5970b15bebe588bcd6ccac98e9b)
-rw-r--r-- 14728 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2392 README
-rwxr-xr-x 252365 gitweb.perl
drwxr-xr-x - static