t / t5100 / patch0007on commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1