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

Re: [PATCH] Use diff3 instead of merge in merge-recursive.

From
Daniel Barkalow <barkalow@iabervon.org>
Date
Oct 19, 2006, 06:31 UTC
Message-ID
<Pine.LNX.4.64.0610190229590.9789@iabervon.org>
In-Reply-To
<Pine.LNX.4.64.0610180835000.3962@g5.osdl.org>
On Wed, 18 Oct 2006, Linus Torvalds wrote:
Show 9 quoted lines
> As to why git uses "merge" - I have this strong memory of having seen 
> machines that had one but not the other, and that, along with the fact 
> that I've used "merge" personally, is why we call "merge" rather than 
> diff3.
> 
> In Linux systems, "merge" usually comes with the RCS package, and "diff3" 
> is usually from "diffutils". It may be that "diff3" is more common. I'm 
> not sure what the history is, and what the situation would tend to be like 
> on other systems..

AFAICT, "merge" actually execs "diff3", so if a system has only one, either it's diff3, it's a "merge" from somewhere other than current rcs, or it doesn't actually work.

	-Daniel
*This .sig left intentionally blank*
Previous: Linus TorvaldsNext: Johannes Schindelin
Message 5 of 8 in “Use diff3 instead of merge in merge-recursive.”
  1. Use diff3 instead of merge in merge-recursive.Uwe Zeisberger, Oct 18, 2006
  2. Jakub NarebskiOct 18, 2006
  3. Johannes SchindelinOct 18, 2006
  4. Linus TorvaldsOct 18, 2006
  5. Daniel BarkalowOct 19, 2006
  6. Johannes SchindelinOct 18, 2006
  7. Uwe ZeisbergerOct 20, 2006
  8. Johannes SchindelinOct 21, 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.