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 <tyr...@gmail.com> wrote:
> On Sun, Dec 23, 2012 at 7:21 PM, Pierrick Charron <pierr...@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

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to