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

Re: Is 'merge' in your path?

From
Romain Francoise <romain@orebokech.com>
Date
Mar 29, 2006, 10:14 UTC
Message-ID
<87mzf9eexb.fsf@pacem.orebokech.com>
In-Reply-To
<tnxmzf9sh7k.fsf@arm.com>
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
Previous: Catalin Marinas
Message 3 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.