t / test-binary-1.pngon commit merge-recursive: check for file level conflicts then get new name (f6f7755)
t/test-binary-1.png