unpack-trees: fix "read-tree -u --reset A B" with conflicted index
[gitweb.git] / t / t4034 / html /
drwxr-xr-x   parent (dest: t/t4034; base: b018ff6085)
-rw-r--r-- 459 expect
-rw-r--r-- 116 post
-rw-r--r-- 79 pre