t / test4012.pngon commit "reset --merge": fix unmerged case (e11d7b5)
t/test4012.png