diff options
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/log-tree.c b/log-tree.c index d0ac0a6327..82d9b5f650 100644 --- a/log-tree.c +++ b/log-tree.c @@ -956,8 +956,7 @@ static void cleanup_additional_headers(struct diff_options *o) static int do_remerge_diff(struct rev_info *opt, struct commit_list *parents, - struct object_id *oid, - struct commit *commit) + struct object_id *oid) { struct merge_options o; struct commit_list *bases; @@ -1052,7 +1051,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log "for octopus merges.\n"); return 1; } - return do_remerge_diff(opt, parents, oid, commit); + return do_remerge_diff(opt, parents, oid); } if (opt->combine_merges) return do_diff_combined(opt, commit); |