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 wrote:
> On Sun, Dec 23, 2012 at 7:21 PM, Pierrick Charron wrote:
>
>> His commit was I think merged, what you're seeing i
On Sun, Dec 23, 2012 at 7:21 PM, Pierrick Charron 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
Hi
On 23 December 2012 12:47, Ferenc Kovacs wrote:
> Hi,
>
> Laruence, why didn't you merged your commits related to bug 63377 from the
> 5.3 branch upwards?
His commit was I think merged, what you're seeing in this merge is
only commit 56d9edbbb93
which was a typo corrected by Felipe.
> Pierri
Hi,
Laruence, why didn't you merged your commits related to bug 63377 from the
5.3 branch upwards?
Pierrick: it seems that you tried to merge the fix to the bug63377 test
which isn't present in the 5.4 branch.
Even if the bug isn't present in the new output buffer code it would be
nice imo if we w
