t / t4034 / html / poston commit merge-recursive: add computation of collisions due to dir rename & merging (ea625cb)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>