Re: com web/php: Merge master from git://github.com/jpauli/web-php.git: archive/archive.xml archive/entries/2013-02-21-2.xml
| From: | Hannes Magnusson | Date: | Sat, 23 Feb 2013 04:48:37 +0000 |
| Subject: | Re: com web/php: Merge master from git://github.com/jpauli/web-php.git: archive/archive.xml archive/entries/2013-02-21-2.xml | ||
| References: | 1 | Groups: | php.webmaster |
| Request: | Send a blank email to php-webmaster+get-15542@lists.php.net to get a copy of this message | ||
On Fri, Feb 22, 2013 at 1:37 AM, David Soria Parra <dsp@php.net> wrote:
> Commit: 1dc8a62e309c71a65ddc4798a5a1b25ccd17a675
> Author: David Soria Parra <dsp@php.net> Fri, 22 Feb 2013 09:37:10 +0000
> Parents: cce14bf932b5bbe92e5bfbabd302c0cff79f0f53 5864c99e3b19525c0808303bf9bb1e464317434a
> Branches: master
>
> Link:
> http://git.php.net/?p=web/php.git;a=commitdiff;h=1dc8a62e309c71a65ddc4798a5a1b25ccd17a675
>
> Log:
> Merge master from git://github.com/jpauli/web-php.git
>
> Changed paths:
> MM archive/archive.xml
> AA archive/entries/2013-02-21-2.xml
>
>
> Diff:
> diff --cc archive/archive.xml
> index 944f689,944f689..2bc0ec6
> --- a/archive/archive.xml
> +++ b/archive/archive.xml
> @@@ -10,6 -10,6 +10,7 @@@
> <email>php-webmaster@lists.php.net</email>
> </author>
> <xi:include href="entries/2013-02-21-1.xml"/>
> ++ <xi:include href="entries/2013-02-21-2.xml"/>
> <xi:include href="entries/2013-02-12-1.xml"/>
Any idea why the diff is showing with two + ?
Same thing clicking the link to git.php.net, but the file looks fine
if you look at the raw file.
-Hannes