unpack-trees: fix "read-tree -u --reset A B" with conflicted index