Re: Is 'merge' in your path?

From: Romain Francoise <romain@orebokech.com>
Date: 2006-03-29 21:14:08
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
-
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
Received on Wed Mar 29 21:14:58 2006

This archive was generated by hypermail 2.1.8 : 2006-03-29 21:15:14 EST