t / test4012.pngon commit checkout -m path: fix recreating conflicts (6d6f9ac)
t/test4012.png