t / test-binary-1.pngon commit merge-recursive: rename conflict_rename_*() family of functions (8ebe7b0)
t/test-binary-1.png