Change pg_regress.c back to using diff -w on Windows

This partially reverts commit 628c1d1f2c.

It appears that there are non line-end differences in some regression
tests on Windows. To keep the buildfarm and CI clients happy, change
this back for now, pending further investigation.

Per reports from Tatsuo Ishii and Nazir Bilal Yavuz.

diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index 9ff0a2d65e2178b905eb56509dba40b8f5d7bf0b..7e7ad256000164866d324a0dbaed652ace84577f 100644 (file)
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -65,8 +65,8 @@ static char *shellprog = SHELLPROG;
 const char *basic_diff_opts = "";
 const char *pretty_diff_opts = "-U3";
 #else
-const char *basic_diff_opts = "--strip-trailing-cr";
-const char *pretty_diff_opts = "--strip-trailing-cr -U3";
+const char *basic_diff_opts = "-w";
+const char *pretty_diff_opts = "-w -U3";
 #endif
 
 /*