t / t4034 / html / preon commit Merge branch 'jc/fix-diff-files-unmerged' (22dbeee)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>