t / t4034 / html / preon commit pull: allow pull to preserve merges when rebasing (66713ef)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>