t / test4012.pngon commit rerere: do not skip two conflicted paths next to each other. (ab242f8)
t/test4012.png