t / t4034 / html / preon commit merge & sequencer: turn "Conflicts:" hint into a comment (261f315)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>