From: Catalin Marinas <catalin.marinas@arm.com>
To: "Brown, Len" <len.brown@intel.com>
Cc: "Andreas Ericsson" <ae@op5.se>, <git@vger.kernel.org>
Subject: Re: Is 'merge' in your path?
Date: Wed, 29 Mar 2006 11:01:03 +0100 [thread overview]
Message-ID: <tnxmzf9sh7k.fsf@arm.com> (raw)
In-Reply-To: <CFF307C98FEABE47A452B27C06B85BB6046AA9@hdsmsx411.amr.corp.intel.com> (Len Brown's message of "Wed, 29 Mar 2006 04:06:40 -0500")
"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
next prev parent reply other threads:[~2006-03-29 10:01 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 [this message]
2006-03-29 10:14 ` Romain Francoise
-- 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=tnxmzf9sh7k.fsf@arm.com \
--to=catalin.marinas@arm.com \
--cc=ae@op5.se \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=len.brown@intel.com \
/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