t / t4034 / html / poston commit mergetool--lib: refactor {diff,merge}_cmd logic (d2512fc)
   1<tag newattr="newvalue">added content</tag>
   2<tag attr="newvalue">changed</tag>
   3<newtag>content &newentity;</newtag>