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:51 UTC
Message-ID
<76718490901230751uef27274sf7b44e6718f861ae@mail.gmail.com>
In-Reply-To
<200901231132.36543.robin.rosenberg.lists@dewire.com>

On Fri, Jan 23, 2009 at 5:32 AM, Robin Rosenberg <robin.rosenberg.lists@dewire.com> wrote:

> Where's the ancestor? I'm used to having four panes for doing three-way
> merges, but your screenshot showed only three.

I installed xxdiff to compare w/opendiff, meld, and vimdiff and I see what you mean with xxdiff.

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.

>> Shrug.
>
> You have the option to ignore me....
Doh, I meant only "I don't understand." My apologies.
j.
Previous: Robin RosenbergNext: Jay Soffian
Message 8 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.