t / test4012.pngon commit make "git merge-tree" a built-in (907a7cb)
t/test4012.png