merge-recursive: do not die on a conflicting submodule
[gitweb.git] / perl /
drwxr-xr-x   parent (dest: ; base: 0c44c94309693d0582e91a6744edc2e8eba46ef8)
-rw-r--r-- 35801 Git.pm
-rw-r--r-- 1391 Makefile
-rw-r--r-- 745 Makefile.PL
-rw-r--r-- 19088 private-Error.pm