t / t4034 / html / poston commit Merge branch 'nd/remote-plural-ours-plus-theirs' (7a7d085)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>