From: Romain Francoise <romain@orebokech.com>
To: Catalin Marinas <catalin.marinas@gmail.com>
Cc: "Andreas Ericsson" <ae@op5.se>, <git@vger.kernel.org>
Subject: Re: Is 'merge' in your path?
Date: Wed, 29 Mar 2006 12:14:08 +0200 [thread overview]
Message-ID: <87mzf9eexb.fsf@pacem.orebokech.com> (raw)
In-Reply-To: <tnxmzf9sh7k.fsf@arm.com> (Catalin Marinas's message of "Wed, 29 Mar 2006 11:01:03 +0100")
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
next prev parent reply other threads:[~2006-03-29 10:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-29 9:06 Is 'merge' in your path? Brown, Len
2006-03-29 10:01 ` Catalin Marinas
2006-03-29 10:14 ` Romain Francoise [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-03-29 8:42 Len Brown
2006-03-29 8:47 ` Andreas Ericsson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87mzf9eexb.fsf@pacem.orebokech.com \
--to=romain@orebokech.com \
--cc=ae@op5.se \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox