Sergey Organov 09322b1da9 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>

2020-12-21 13:47:31 -08:00

2.1 KiB

Raw Blame History

View Raw