t / test-binary-2.pngon commit merge-recursive: make "CONFLICT (rename/delete)" message show both paths (b26d87f)
t/test-binary-2.png