t / t5100 / msg0016on commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1and some content
   2