t6042: add testcase covering rename/rename(2to1)/delete/delete conflict
[gitweb.git] / t / t9151 /
drwxr-xr-x   parent (dest: t; base: eee73388f25a7a0c61b2200868d93ff8d91b27ca)
-rwxr-xr-x 7105 make-svnmerge-dump
-rw-r--r-- 48946 svn-mergeinfo.dump