t / t4034 / html / poston commit Merge branch 'jc/checkout-from-tree-keep-local-changes' (66d2c22)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>