Andrew's git / gitweb.git / t/t4034/html/pre
?
t / t4034 / html / preon commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>