Merge branch 'en/merge-ort-api-null-impl'

[thirdparty/git.git] / log-tree.c

diff --git a/log-tree.c b/log-tree.c
index cb8942fec1816c861161269a57b6048e1e523951..1927f917ce94ce2ec95c889754d6a86177fa2cac 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -885,7 +885,7 @@ int log_tree_diff_flush(struct rev_info *opt)
 
 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
 {
-       diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
+       diff_tree_combined_merge(commit, opt);
        return !opt->loginfo;
 }