t / t4034 / html / poston commit mergetools: simplify how we handle "vim" and "defaults" (073678b)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>