ll-merge: use a longer conflict marker for internal merge
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: d694a17986a28bbc19e2a6c32404ca24572e400f)
-rw-r--r-- 14728 INSTALL
-rw-r--r-- 5641 Makefile
-rw-r--r-- 2392 README
-rwxr-xr-x 251684 gitweb.perl
drwxr-xr-x - static