git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: t6021-merge-criss-cross.sh fails on some systems

From
DMDavid S. Miller <davem@davemloft.net>
Date
Dec 11, 2005, 07:58 UTC
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
:-)
Previous: Fredrik KuivinenNext: Junio C Hamano
Message 3 of 5 in “t6021-merge-criss-cross.sh fails on some systems”
  1. David S. MillerDec 10, 2005
  2. Fredrik KuivinenDec 11, 2005
  3. David S. MillerDec 11, 2005
  4. Junio C HamanoDec 11, 2005
  5. David S. MillerDec 11, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.