From 79005f1b794d9d9a5de7fb22a6f5ca4f2c730382 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Mon, 20 Feb 2017 13:24:55 -0800
Subject: use "diff -a" in case special characters were written to the test
 output

---
 ChangeLog     | 3 +++
 Test/ztst.zsh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 60a5164d6..d06dbfb01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2017-02-20  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* unposted: Test/ztst.zsh: use "diff -a" in case special characters
+	were written to the test output
+
 	* 40598: Src/subst.c: paramsubst() should always return scalar
 	when PREFORK_SINGLE was passed in from prefork()
 
diff --git a/Test/ztst.zsh b/Test/ztst.zsh
index f172ae143..0b2679927 100755
--- a/Test/ztst.zsh
+++ b/Test/ztst.zsh
@@ -334,7 +334,7 @@ ZTST_diff() {
       diff_ret=1
     fi
   else
-    diff_out=$(diff "$@")
+    diff_out=$(diff -a "$@")
     diff_ret="$?"
     if [[ "$diff_ret" != "0" ]]; then
       print -r -- "$diff_out"
-- 
cgit 1.4.1