[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: Is 'merge' in your path?
From:       Romain Francoise <romain () orebokech ! com>
Date:       2006-03-29 10:14:08
Message-ID: 87mzf9eexb.fsf () pacem ! orebokech ! com
[Download RAW message or body]

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
[prev in list] [next in list] [prev in thread] [next in thread]