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