Merge pull request #1844 from AhmedAbdellah19/adding_read_files_from_file_feature

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

Fri, 25 Oct 2019 17:11:47 +0000 (10:11 -0700)

committer GitHub <noreply@github.com>

Fri, 25 Oct 2019 17:11:47 +0000 (10:11 -0700)
author Yann Collet <Cyan4973@users.noreply.github.com>
Fri, 25 Oct 2019 17:11:47 +0000 (10:11 -0700)
committer GitHub <noreply@github.com>
Fri, 25 Oct 2019 17:11:47 +0000 (10:11 -0700)
diff --cc programs/util.c
Simple merge
diff --cc programs/util.h
Simple merge
diff --cc programs/zstdcli.c
Simple merge
diff --cc tests/playTests.sh
Simple merge
author	Yann Collet <Cyan4973@users.noreply.github.com>
	Fri, 25 Oct 2019 17:11:47 +0000 (10:11 -0700)
committer	GitHub <noreply@github.com>
	Fri, 25 Oct 2019 17:11:47 +0000 (10:11 -0700)
		1	2
programs/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
programs/util.h	patch \|	diff1 \|	diff2 \|	blob \| history
programs/zstdcli.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/playTests.sh	patch \|	diff1 \|	diff2 \|	blob \| history