t / test-binary-1.pngon commit merge-recursive: fix overwriting dirty files involved in renames (e0052f4)
t/test-binary-1.png