From: senhuang42 <senhuang96@fb.com>
Date: Wed, 26 Aug 2020 19:43:38 +0000 (-0400)
Subject: Fix merge conflicts
X-Git-Tag: v1.4.7~87^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aec385a1006be4d44ad3361eb90a8f34b4678a0;p=thirdparty%2Fzstd.git

Fix merge conflicts
---

3aec385a1006be4d44ad3361eb90a8f34b4678a0
diff --cc tests/playTests.sh
index 02fd7cdc1,f3b66e349..608d4228f
--- a/tests/playTests.sh
+++ b/tests/playTests.sh
@@@ -361,23 -368,7 +368,23 @@@ zstd tmp1.zst tmp2.zst -o "$INTOVOID" -
  zstd -d tmp1.zst tmp2.zst -o tmp
  touch tmpexists
  zstd tmp1 tmp2 -f -o tmpexists
- zstd tmp1 tmp2 -o tmpexists && die "should have refused to overwrite"
+ zstd tmp1 tmp2 -q -o tmpexists && die "should have refused to overwrite"
 +println gooder > tmp_rm1
 +println boi > tmp_rm2
 +println worldly > tmp_rm3
 +echo 'y' | zstd tmp_rm1 tmp_rm2 -o tmp_rm3.zst --rm     # tests the warning prompt for --rm with multiple inputs into once source
 +test ! -f tmp_rm1
 +test ! -f tmp_rm2
 +cp tmp_rm3.zst tmp_rm4.zst
 +echo 'Y' | zstd -d tmp_rm3.zst tmp_rm4.zst -o tmp_rm_out --rm
 +test ! -f tmp_rm3.zst
 +test ! -f tmp_rm4.zst
 +echo 'yes' | zstd tmp_rm_out tmp_rm3 -c --rm
 +test ! -f tmp_rm_out
 +test ! -f tmp_rm3
 +println gooder > tmpexists1
 +zstd tmpexists1 tmpexists -c --rm -f
 +
  # Bug: PR #972
  if [ "$?" -eq 139 ]; then
    die "should not have segfaulted"