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