summaryrefslogtreecommitdiff
path: root/negotiator/default.c
diff options
context:
space:
mode:
authorLibravatar Sergey Organov <sorganov@gmail.com>2020-12-21 18:19:38 +0300
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-12-21 13:47:31 -0800
commit09322b1da92fd32204c8b4b07cf12decccfe47f3 (patch)
tree74698f04a0722bf2ab75f8af317b9225ba414860 /negotiator/default.c
parentdiff-merges: re-arrange functions to match the order they are called in (diff)
downloadtgif-09322b1da92fd32204c8b4b07cf12decccfe47f3.tar.xz
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 'negotiator/default.c')
0 files changed, 0 insertions, 0 deletions