Merge pull request #3027 from brailovich/dev

author Yann Collet <Cyan4973@users.noreply.github.com>

Sat, 29 Jan 2022 23:40:43 +0000 (15:40 -0800)

committer GitHub <noreply@github.com>

Sat, 29 Jan 2022 23:40:43 +0000 (15:40 -0800)
author Yann Collet <Cyan4973@users.noreply.github.com>
Sat, 29 Jan 2022 23:40:43 +0000 (15:40 -0800)
committer GitHub <noreply@github.com>
Sat, 29 Jan 2022 23:40:43 +0000 (15:40 -0800)
diff --cc programs/zstdcli.c
Simple merge
diff --cc tests/playTests.sh
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Sat, 29 Jan 2022 23:40:43 +0000 (15:40 -0800)
committer	GitHub <noreply@github.com>
	Sat, 29 Jan 2022 23:40:43 +0000 (15:40 -0800)
		1	2
programs/zstdcli.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/playTests.sh	patch \|	diff1 \|	diff2 \|	blob \| history