diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-24 12:28:54 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-24 12:28:54 +0100 |
| commit | 1d0247db7d86172eefdc1622d0fc1cbc3b956d52 (patch) | |
| tree | 11f12940710a3175d0d87a7b1f600b737f3773e2 /run-tests.php | |
| parent | c2d0a413cc213e5a6dcb3ebaab0668a293ff3a4a (diff) | |
| parent | c6cf354a9acd3d79f3b9fbf08c85aff4c7433bd3 (diff) | |
| download | php-git-1d0247db7d86172eefdc1622d0fc1cbc3b956d52.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't use CRLF when generating diffs
Diffstat (limited to 'run-tests.php')
| -rwxr-xr-x | run-tests.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php index 9219e09185..7f39564a64 100755 --- a/run-tests.php +++ b/run-tests.php @@ -2918,7 +2918,7 @@ function generate_diff($wanted, $wanted_re, $output) $r = is_null($wanted_re) ? $w : explode("\n", $wanted_re); $diff = generate_array_diff($r, $o, !is_null($wanted_re), $w); - return implode("\r\n", $diff); + return implode(PHP_EOL, $diff); } function error($message) |