cmd_merge(): Parse options before checking MERGE_HEAD
[gitweb.git] / gitweb /
drwxr-xr-x   parent (dest: ; base: 2a22c1b35d6110e72d86a2fac4b68dbad0905adb)
-rw-r--r-- 10626 INSTALL
-rw-r--r-- 4498 Makefile
-rw-r--r-- 22110 README
-rwxr-xr-x 210996 gitweb.perl
drwxr-xr-x - static