t / t4034 / html / preon commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1<tag>content</tag>
   2<tag attr="value">content</tag>
   3<tag>content &entity;</tag>