I try to push a bug fix https://bugs.php.net/bug.php?id=60947 for php into 5.4 and trunk
git merge --no-ff --log PHP-5.3 Auto-merging main/output.c CONFLICT (content): Merge conflict in main/output.c Automatic merge failed; fix conflicts and then commit the result. -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
