t / t4034 / html / poston commit Merge branch 'jc/combine-diff-many-parents' (4dd7c77)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>