merge-file: let conflict markers match end-of-line style of the context
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 86efa215276aaeaef0c556c73f1993b6f36dcf91)
-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