t6036: add a failed conflict detection case with submodule add/add
[gitweb.git] / t / t9150 /
drwxr-xr-x   parent (dest: t; base: a79968bed184029139ddcd0a4e8171a2c84852ee)
-rwxr-xr-x 1185 make-svk-dump
-rw-r--r-- 15522 svk-merge.dump