unpack-trees: fix "read-tree -u --reset A B" with conflicted index
[gitweb.git] / t / t3900 /
drwxr-xr-x   parent (dest: t; base: b018ff6085)
-rw-r--r-- 23 1-UTF-8.txt
-rw-r--r-- 100 2-UTF-8.txt
-rw-r--r-- 86 ISO-2022-JP.txt
-rw-r--r-- 15 ISO8859-1.txt
-rw-r--r-- 68 eucJP.txt