diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:51 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:51 (GMT) |
commit | 34415c76c8f67c8692090ef4911d1626689e8f38 (patch) | |
tree | 394d71e84f1909532a6a0e1654d3ff314a9bd39b /diff.h | |
parent | 58138d3f266569f945a7abc86fc897111c47640f (diff) | |
parent | d01141de5ab02cf4a156183ef4dc5ee8bf2638a3 (diff) | |
download | git-34415c76c8f67c8692090ef4911d1626689e8f38.zip git-34415c76c8f67c8692090ef4911d1626689e8f38.tar.gz git-34415c76c8f67c8692090ef4911d1626689e8f38.tar.bz2 |
Merge branch 'so/combine-diff-simplify'
Code simplification.
* so/combine-diff-simplify:
diff: get rid of redundant 'dense' argument
Diffstat (limited to 'diff.h')
-rw-r--r-- | diff.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -452,11 +452,11 @@ struct combine_diff_path { st_mult(sizeof(struct combine_diff_parent), (n))) void show_combined_diff(struct combine_diff_path *elem, int num_parent, - int dense, struct rev_info *); + struct rev_info *); -void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev); +void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev); -void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev); +void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev); void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); |