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