git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Is 'merge' in your path?

From
CMCatalin Marinas <catalin.marinas@arm.com>
Date
Mar 29, 2006, 10:01 UTC
Message-ID
<tnxmzf9sh7k.fsf@arm.com>
In-Reply-To
<CFF307C98FEABE47A452B27C06B85BB6046AA9@hdsmsx411.amr.corp.intel.com>
"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
Previous: Brown, LenNext: Romain Francoise
Message 2 of 3 in “RE: Is 'merge' in your path?”
  1. Brown, LenMar 29, 2006
  2. Catalin MarinasMar 29, 2006
  3. Romain FrancoiseMar 29, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.