unpack-trees: fix "read-tree -u --reset A B" with conflicted index
[gitweb.git] / t / t9150 /
drwxr-xr-x   parent (dest: t; base: b018ff6085)
-rw-r--r-- 1185 make-svk-dump
-rw-r--r-- 15522 svk-merge.dump