t / t4034 / html / preon commit Merge branch 'fc/rerere-conflict-style' into maint (ada8710)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>