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
-
: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html