Hi! It seems there has been an unresolved bad merge. When I attempt an empty merge from PHP-5.6 into PHP-7.0, Git reports 18 conflicting files.
Can somebody please have a look at this issue. -- Christoph M. Becker -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
