t / test4012.pngon commit merge-recursive: refuse to merge binary files (9f30855)
t/test4012.png