t / t5100 / rfc2047-info-0006on commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1Subject: (a b)
   2