t / test-binary-1.pngon commit merge-recursive: fix remaining directory rename + dirty overwrite cases (18797a3)
t/test-binary-1.png