git.99rst.org Git - git.git/commit

author	Sergey Organov <redacted>
	Mon, 21 Dec 2020 15:19:38 +0000 (18:19 +0300)
committer	Junio C Hamano <redacted>
	Mon, 21 Dec 2020 21:47:31 +0000 (13:47 -0800)
commit	09322b1da92fd32204c8b4b07cf12decccfe47f3
tree	74698f04a0722bf2ab75f8af317b9225ba414860	tree \| snapshot
parent	564a4fc8471b41fc05bda16e4bbb02a99b515cbf	commit \| diff

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 <redacted>
Signed-off-by: Junio C Hamano <redacted>

builtin/merge.c		diff \| blob \| history
diff-merges.c		diff \| blob \| history
diff-merges.h		diff \| blob \| history
fmt-merge-msg.c		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT