From: Andreas Ericsson <ae@op5.se>
To: Len Brown <len.brown@intel.com>
Cc: git@vger.kernel.org
Subject: Re: Is 'merge' in your path?
Date: Wed, 29 Mar 2006 10:47:55 +0200 [thread overview]
Message-ID: <442A49BB.2060200@op5.se> (raw)
In-Reply-To: <200603290342.40970.len.brown@intel.com>
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
next prev parent reply other threads:[~2006-03-29 8:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-29 8:42 Is 'merge' in your path? Len Brown
2006-03-29 8:47 ` Andreas Ericsson [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-03-29 9:06 Brown, Len
2006-03-29 10:01 ` Catalin Marinas
2006-03-29 10:14 ` Romain Francoise
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=442A49BB.2060200@op5.se \
--to=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=len.brown@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox