From: David S. Miller <davem@davemloft.net>
Date: Sun, 11 Dec 2005 07:58:18 GMT
Subject: Re: t6021-merge-criss-cross.sh fails on some systems
Message-ID: <20051210.235818.90276521.davem@davemloft.net>
In-Reply-To: <20051211003353.GA27207@c165.ib.student.liu.se>

From: Fredrik Kuivinen <freku045@student.liu.se>
Date: Sun, 11 Dec 2005 01:33:53 +0100

> It looks like 'merge' can't be found. The recursive merge strategy
> uses 'merge' to do file-level merging. Do you have merge(1)
> installed?

Yet another weird dependency. :-/  Thanks for the info.

I bet a tiny shell script could run at GIT build time
to check for the presence of these necessary items. :-)
Yes, the debian/rpm/etc. packaging dependencies will catch
this, but a lot of us are doing:

git pull && make && make test && make install

:-)