From: Catalin Marinas <catalin.marinas@arm.com>
Date: Wed, 29 Mar 2006 10:01:03 GMT
Subject: Re: Is 'merge' in your path?
Message-ID: <tnxmzf9sh7k.fsf@arm.com>
In-Reply-To: <CFF307C98FEABE47A452B27C06B85BB6046AA9@hdsmsx411.amr.corp.intel.com>

"Brown, Len" <len.brown@intel.com> wrote:
>>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.
>
> blank indeed.  I guess I don't have rcs on this laptop.

Actually, I think git could use diff3 directly and not rely on "merge"
from rcs which seems to be equivalent to "diff3 -m -E" (it might even
call diff3, I'm not sure).

Are there any features in "merge" and not available in "diff3"?

-- 
Catalin