t7405: verify 'merge --abort' works after submodule/path conflicts
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 587421ebddec17e6e9aaf55b61aa40ad4ad9e43e)
-rw-r--r-- 14694 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2392 README
-rwxr-xr-x 252222 gitweb.perl
drwxr-xr-x - static