t6036: add lots of detail for directory/file conflicts in recursive case
[gitweb.git] / t / t9151 /
drwxr-xr-x   parent (dest: t; base: 327ac9cb9dda3ef8be5cc66a01daa32c6e8c8639)
-rwxr-xr-x 7105 make-svnmerge-dump
-rw-r--r-- 48946 svn-mergeinfo.dump