On Thu, 30 Nov 2006, Linus Torvalds wrote:
quoted text
> 
> So my guess is that there wasn't actually a conflict at all, but the 
> "merge" program (usually in /usr/bin/merge) returned an error for some 
> reason. What does "which merge" and "rpm -qf /usr/bin/merge" say?

Side note: the historically more common failure was to not have a merge 
program at all, but exactly because that was common, we check for that and 
complain about it. So that's not it for you - you do have a 'merge' 
program somewhere that git found.

But if it returns the wrong error code, or doesn't do anything at all (ie 
you have "merge", but it's not the 3-way merge we expect, or it doesn't 
take the "-L" argument we use, or it's simply buggy) then that might 
explain the behaviour you report.

Or it might be something totally different. This is just a wild theory.

		Linus
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html