Merge branch 'da/mergetool-delete-delete-conflict'
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: e094194f08c3d7f3d9ea1714d34ee20ba82f6851)
-rw-r--r-- 14728 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2392 README
-rwxr-xr-x 251701 gitweb.perl
drwxr-xr-x - static