t / test-binary-1.pngon commit rerere: teach rerere to handle nested conflicts (4af3220)
t/test-binary-1.png