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

Re: Merging adjacent deleted lines?

From
Jay Soffian <jaysoffian@gmail.com>
Date
Jan 23, 2009, 15:59 UTC
Message-ID
<76718490901230759k25c4d0c9t57c648f3e373c5bb@mail.gmail.com>
In-Reply-To
<76718490901230751uef27274sf7b44e6718f861ae@mail.gmail.com>
On Fri, Jan 23, 2009 at 10:51 AM, Jay Soffian <jaysoffian@gmail.com> wrote:
> opendiff/meld/vimdiff don't show the ancestor directly, but they are
> still using it in order to show how one version differs from the
> ancestor in the left pane, and how the other version differs in the
> right pane.

Hmm, okay. I see that meld/vimdiff are apparently not doing a 3-way merge. So I guess after all this, I don't have an explanation about opendiff. It claims to do a 3-way diff and mergetool is passing it the ancestor as an argument. Sorry for the confusion.

j.
Previous: Jay Soffian
Message 9 of 9 in “Merging adjacent deleted lines?”
  1. Jonathan del StrotherJan 21, 2009
  2. Robin RosenbergJan 21, 2009
  3. Junio C HamanoJan 21, 2009
  4. Jonathan del StrotherJan 22, 2009
  5. Robin RosenbergJan 22, 2009
  6. Jay SoffianJan 23, 2009
  7. Robin RosenbergJan 23, 2009
  8. Jay SoffianJan 23, 2009
  9. Jay SoffianJan 23, 2009

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.