]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2d0a41 c6cf354)
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 24 Jan 2020 11:28:54 +0000 (12:28 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 24 Jan 2020 11:28:54 +0000 (12:28 +0100)
* PHP-7.4:
  Don't use CRLF when generating diffs

1  2 
run-tests.php patch | diff1 | diff2 | blob | history

diff --cc run-tests.php
Simple merge
Unnamed repository; edit this file 'description' to name the repository.