Subject: Re: Cygwin test failure in t6021-merge-criss-cross.sh

From: Tim O'Callaghan <[email-masked]>
Date: Tue, 6 Dec 2005 18:10:38 +0100

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