t / t5100 / msg0009on commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
   1This is to fix diff-format documentation.
   2