From: Romain Francoise <romain@orebokech.com>
Date: Wed, 29 Mar 2006 10:14:08 GMT
Subject: Re: Is 'merge' in your path?
Message-ID: <87mzf9eexb.fsf@pacem.orebokech.com>
In-Reply-To: <tnxmzf9sh7k.fsf@arm.com>

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