cmd_merge(): Parse options before checking MERGE_HEAD
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: 2a22c1b35d6110e72d86a2fac4b68dbad0905adb)
-rw-r--r-- 35938 Git.pm
-rw-r--r-- 1446 Makefile
-rw-r--r-- 1003 Makefile.PL
-rw-r--r-- 19088 private-Error.pm