Merge pull request #3220 from embg/issue3200

author Elliot Gorokhovsky <embg@fb.com>

Mon, 1 Aug 2022 18:04:57 +0000 (14:04 -0400)

committer GitHub <noreply@github.com>

Mon, 1 Aug 2022 18:04:57 +0000 (14:04 -0400)
author Elliot Gorokhovsky <embg@fb.com>
Mon, 1 Aug 2022 18:04:57 +0000 (14:04 -0400)
committer GitHub <noreply@github.com>
Mon, 1 Aug 2022 18:04:57 +0000 (14:04 -0400)
diff --cc programs/util.c
Simple merge
diff --cc programs/zstdcli.c
Simple merge
author	Elliot Gorokhovsky <embg@fb.com>
	Mon, 1 Aug 2022 18:04:57 +0000 (14:04 -0400)
committer	GitHub <noreply@github.com>
	Mon, 1 Aug 2022 18:04:57 +0000 (14:04 -0400)
		1	2
programs/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
programs/zstdcli.c	patch \|	diff1 \|	diff2 \|	blob \| history