Re: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt
| From: | Ferenc Kovacs | Date: | Sun, 23 Dec 2012 19:22:01 +0000 |
| Subject: | Re: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt | ||
| References: | 1 2 3 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-70801@lists.php.net to get a copy of this message | ||
On Sun, Dec 23, 2012 at 7:21 PM, Pierrick Charron <pierrick@php.net> wrote:
> His commit was I think merged, what you're seeing in this merge is
>
If it was merged then why is the testfile missing (causing your merge
conflict)?
--
Ferenc Kovács
@Tyr43l - http://tyrael.hu