]> git.ipfire.org Git - thirdparty/git.git/commit
diff-merges: cleanup set_diff_merges()
authorSergey Organov <sorganov@gmail.com>
Wed, 14 Sep 2022 19:31:01 +0000 (22:31 +0300)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Sep 2022 16:21:43 +0000 (09:21 -0700)
commit563005ecbf552b1be5f632a049ed6cd4fd6aa4e2
tree2a6eefedfd1ee825a6477462cfd05ebbd2f6035c
parentc7c4f7608afe811ea5c2095d93020639707a8733
diff-merges: cleanup set_diff_merges()

Get rid of special-casing of 'suppress' in set_diff_merges(). Instead
set 'merges_need_diff' flag correctly in every option handling
function.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-merges.c