diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-06 00:01:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-06 00:01:51 +0300 |
| commit | 34415c76c8f67c8692090ef4911d1626689e8f38 (patch) | |
| tree | 394d71e84f1909532a6a0e1654d3ff314a9bd39b /log-tree.c | |
| parent | 58138d3f266569f945a7abc86fc897111c47640f (diff) | |
| parent | d01141de5ab02cf4a156183ef4dc5ee8bf2638a3 (diff) | |
Merge branch 'so/combine-diff-simplify'
Code simplification.
* so/combine-diff-simplify:
diff: get rid of redundant 'dense' argument
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index cb8942fec1..1927f917ce 100644 --- 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; } |