t / t4034 / html / poston commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>