Re: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/standard/tests/file/bug52820.phpt
| From: | Pierrick Charron | Date: | Sun, 23 Dec 2012 23:01:04 +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 4 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-70807@lists.php.net to get a copy of this message | ||
When merging you can specify that a file don't need to be on the
destination branch.
That's probably what Laurence did :)
Pierrick
On 23 December 2012 14:22, Ferenc Kovacs <tyra3l@gmail.com> wrote:
> 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