t6036: add a failed conflict detection case with submodule modify/modify
[gitweb.git] / t / t9151 /
drwxr-xr-x   parent (dest: t; base: d4d17180808437fd732a9d14388657b8f609ad4a)
-rwxr-xr-x 7105 make-svnmerge-dump
-rw-r--r-- 48946 svn-mergeinfo.dump