merge-recursive: Fix code checking for D/F conflicts still being present
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: f2507b4e0ef0b7fc8c1e75004e8a86a0430dc512)
-rw-r--r-- 10929 INSTALL
-rw-r--r-- 4769 Makefile
-rw-r--r-- 23376 README
-rwxr-xr-x 221547 gitweb.perl
drwxr-xr-x - static