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