t / test4012.pngon commit Use merge-recursive in git-am -3. (579c9bb)
t/test4012.png