t / t5100 / msg0015on commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1  - a list
   2  - of stuff