merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 86273e5764ab7faaa84c3de1a428ed24a6cfdf1f)
-rw-r--r-- 10626 INSTALL
-rw-r--r-- 4498 Makefile
-rw-r--r-- 22109 README
-rwxr-xr-x 211032 gitweb.perl
drwxr-xr-x - static