Re: com web/php: Merge branch 'pull-request/68': js/common.js
| From: | Christoph Becker | Date: | Wed, 24 Jun 2015 21:34:28 +0000 |
| Subject: | Re: com web/php: Merge branch 'pull-request/68': js/common.js | ||
| References: | 1 2 3 | Groups: | php.webmaster |
| Request: | Send a blank email to php-webmaster+get-21448@lists.php.net to get a copy of this message | ||
Peter Cowburn wrote:
> On 24 June 2015 at 03:25, Hannes Magnusson <hannes.magnusson@gmail.com>
> wrote:
>
>> This looks like a bad merge. Are you sure everything is OK?
>
> *shrug* I have no idea why Git shows the merge like that. However, the
> file looks okay to me.
The Github diff looks also rather different:
<https://github.com/php/web-php/commit/d21f458fc610449296d5153b1636c6a46976b093>.
Nice Easter eggs, by the way! :)
--
Christoph M. Becker