From: Tim O'Callaghan <timo@dspsrv.com>
Date: Tue, 06 Dec 2005 17:10:38 GMT
Subject: Re: Cygwin test failure in t6021-merge-criss-cross.sh
Message-ID: <20051206171037.GH2364@ELSAMSW37164>
In-Reply-To: <7v1x0q419j.fsf@assigned-by-dhcp.cox.net>

On Tue, Dec 06, 2005 at 08:51:36AM -0800, Junio C Hamano wrote:
> I have this strange feeling that you do not have "merge"
> installed on your cygwin box.  It is part of "rcs".
> 

Thanks, that was it. Another dependency to add to git-core :)

> When you see a test failure, it sometimes useful to try running:
> 
>     $ cd t
>     $ sh ./t6021-*.sh -i -v
> 
> manually.
> 

Duly noted.

Tim.
"I've worked myself up from nothing to a state of supreme poverty."
-- Groucho Marx