On Mon, Jun 16, 2008 at 10:56 AM, Sebastian Bergmann
<[EMAIL PROTECTED]> wrote:
>  ext/phar/phar.phar seems to be modified during "make" as it always
>  conflicts here on "cvs up":
>
>   P ext/phar/phar.c
>   cvs update: nonmergeable file needs merge
>   cvs update: revision 1.7.2.19 from repository is now in
>   ext/phar/phar.phar
>   cvs update: file from working directory is now in .#phar.phar.1.7.2.14
>   C ext/phar/phar.phar
>
>  Can someone please look into this? Thanks!

If that's the case, it would be nice to have phar.phar.in-like and
generate one in the build directory.

-- 
Pierre
http://blog.thepimp.net | http://www.libgd.org

-- 
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to