unpack-trees: fix "read-tree -u --reset A B" with conflicted index
[gitweb.git] / t / t9151 /
drwxr-xr-x   parent (dest: t; base: b018ff6085)
-rw-r--r-- 7105 make-svnmerge-dump
-rw-r--r-- 48946 svn-mergeinfo.dump