unpack-trees: fix "read-tree -u --reset A B" with conflicted index
[gitweb.git] / t / t9601 /
drwxr-xr-x   parent (dest: t; base: b018ff6085)
drwxr-xr-x - cvsroot