Andrew's git / gitweb.git / t/t4034/html/post
?
t / t4034 / html / poston commit merge-recursive: Provide more info in conflict markers with file renames (3c217c0)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>