t / t4034 / html / poston commit Merge branch 'jc/fix-diff-files-unmerged' into maint (a613b53)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>