summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2020-12-21 15:19:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-12-21 21:47:31 (GMT)
commit09322b1da92fd32204c8b4b07cf12decccfe47f3 (patch)
tree74698f04a0722bf2ab75f8af317b9225ba414860 /builtin/diff.c
parent564a4fc8471b41fc05bda16e4bbb02a99b515cbf (diff)
downloadgit-09322b1da92fd32204c8b4b07cf12decccfe47f3.zip
git-09322b1da92fd32204c8b4b07cf12decccfe47f3.tar.gz
git-09322b1da92fd32204c8b4b07cf12decccfe47f3.tar.bz2
diff-merges: new function diff_merges_suppress()
This function sets all the relevant flags to disabled state, so that no code that checks only one of them get it wrong. Then we call this new function everywhere where diff merges output suppression is needed. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions