threads / discuss / 3748

RE: Is 'merge' in your path?

Subject: RE: Is 'merge' in your path?

## tl;dr

3 messages between Mar 29, 2006 and Mar 29, 2006.

replies: 2people: 3as markdown or json

Brown, Len· Mar 29, 2006, 09:06 UTC · lore

>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.

thanks, -Len

Catalin Marinas· Mar 29, 2006, 10:01 UTC · re: Brown, Len · lore

Re: Is 'merge' in your path?

"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

Romain Francoise· Mar 29, 2006, 10:14 UTC · re: Catalin Marinas · lore

Re: Is 'merge' in your path?

Catalin Marinas <catalin.marinas@arm.com> writes:

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

`merge' from GNU RCS is just a wrapper around diff3.

-- 
Romain Francoise <romain@orebokech.com> | The sea! the sea! the open
it's a miracle -- http://orebokech.com/ | sea! The blue, the fresh, the
                                        | ever free! --Bryan W. Procter