t / test4012.pngon commit merge-recursive: Create function for merging with branchname:file markers (dac4741)
t/test4012.png