Re: Is 'merge' in your path?

Len Brown wrote:

trying to do a merge on my laptop using git as of today,
but it bombs out.  anybody seen this?

lenb@toshiba:~/src> git --version
git version 1.3-rc1.GIT

lenb@toshiba:~/src/linux-acpi-2.6> /lab/bin/git.update test
Trying really trivial in-index merge...
fatal: Merge requires file-level merging

....

Failed to execute 'merge'. merge(1) is used as the file-level merge tool. Is 
'merge' in your path?
No merge strategy handled the merge.
lenb@toshiba:~/src/linux-acpi-2.6> which git-merge
/home/lenb/bin/git-merge
lenb@toshiba:~/src/linux-acpi-2.6> which git
/home/lenb/bin/git
lenb@toshiba:~/src/linux-acpi-2.6>

What does "which merge" tell you? If it turns up blank, you know the 
problem. The merge program is usually found in the rcs package.

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231