t / t4034 / html / poston commit unpack-trees: fix "read-tree -u --reset A B" with conflicted index (b018ff6)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>