t / test-binary-2.pngon commit merge-tree: remove unused df_conflict arguments (5706528)
t/test-binary-2.png