Jeff King <peff@xxxxxxxx> writes:
> On Thu, Feb 26, 2015 at 01:47:34PM -0800, Stefan Beller wrote:
>
>> On Thu, Feb 26, 2015 at 1:42 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote:>
>> > Here is what I queued. Thanks.
>>
>> I did not follow the thread if there are any intermediate patches,
>> though it applied cleanly.
>
> What Junio posted is missing the hunk to drop the old static definition
> of get_preferred_languages from http.c.
I am still scratching my head to see how this happened, but I think
when I did
$ git checkout ye/http-accept-language
$ git apply -3 $gmane/264422
I took the wrong side of the confict in http.c
Thanks both for noticing. Now it is fixed up.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html