t / test-binary-1.pngon commit rerere: handle conflicts with multiple stage #1 entries (5eda906)
t/test-binary-1.png