t / t4034 / html / preon commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>