merge-tree: remove unused df_conflict arguments
[git] / t / t5100 / patch0007