summaryrefslogtreecommitdiff
path: root/diff-merges.h
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2020-12-21 15:19:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-21 21:47:31 (GMT)
commit3b6c17b5c0bd126e3c712f5de909a033d99f1e3a (patch)
treeae28287b99d1f72a2edcd1c99943a3473bbd5efa /diff-merges.h
parent09322b1da92fd32204c8b4b07cf12decccfe47f3 (diff)
downloadgit-3b6c17b5c0bd126e3c712f5de909a033d99f1e3a.zip
git-3b6c17b5c0bd126e3c712f5de909a033d99f1e3a.tar.gz
git-3b6c17b5c0bd126e3c712f5de909a033d99f1e3a.tar.bz2
diff-merges: new function diff_merges_set_dense_combined_if_unset()
Call it where given functionality is needed instead of direct checking/tweaking of diff merges related fields. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-merges.h')
-rw-r--r--diff-merges.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/diff-merges.h b/diff-merges.h
index a031240..f92de13 100644
--- a/diff-merges.h
+++ b/diff-merges.h
@@ -19,6 +19,8 @@ void diff_merges_default_to_first_parent(struct rev_info *revs);
void diff_merges_default_to_dense_combined(struct rev_info *revs);
+void diff_merges_set_dense_combined_if_unset(struct rev_info *revs);
+
void diff_merges_setup_revs(struct rev_info *revs);
#endif