merge-recursive: do not die on a conflicting submodule
[gitweb.git] / t / t9135 /
drwxr-xr-x   parent (dest: t; base: 0c44c94309693d0582e91a6744edc2e8eba46ef8)
-rw-r--r-- 2275 svn.dump