submodule: use diff_tree_combined_merge() instead of diff_tree_combined()