t / t5100 / msg0006on commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1Here is a patch from A U Thor.
   2