t / test4012.pngon commit git merge -X<option> (8cc5b29)
t/test4012.png