From: Rajkumar S <rajkumars@asianetindia•com>
To: git@vger•kernel.org
Subject: git merge in FreeBSD
Date: Wed, 15 Mar 2006 20:22:44 +0530 [thread overview]
Message-ID: <44182A3C.80701@asianetindia.com> (raw)
Hi,
I get a "git-merge-recursive: not found" error when I try to do a merge in FreeBSD. Same
command in Linux does not give an error.
# git merge "Merging from updates" RELENG_1 RELENG_1_origin
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
/usr/local/bin/git-merge: git-merge-recursive: not found
No merge strategy handled the merge.
I am using git version 1.2.4.gea75 in FreeBSD 6
raj
next reply other threads:[~2006-03-15 14:53 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-15 14:52 Rajkumar S [this message]
2006-03-15 16:42 ` git merge in FreeBSD Eric Anholt
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=44182A3C.80701@asianetindia.com \
--to=rajkumars@asianetindia$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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