t / t4034 / html / poston commit t6044: new merge testcases for when index doesn't match HEAD (a6ee883)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>