From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 09 Nov 2010 15:42:46 GMT
Subject: Re: win32-daemon breakage when merged to pu
Message-ID: <7vbp5yo64p.fsf@alter.siamese.dyndns.org>
In-Reply-To: <AANLkTikXv8BhW-fz=pZ5iS6rHJB5mxMUhk0KFO3JSwWv@mail.gmail.com>

Erik Faye-Lund <kusmabite@gmail.com> writes:

> I supposed the correct conflict-resolution would be to keep Markus'
> new conditional inclusion, but move it to the location I changed it
> to. With this patch on top it compiles just fine for me:

Thanks.