t / t4034 / html / preon commit am --skip: revert changes introduced by failed 3way merge (88d5072)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>