cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-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