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

Re: Merging adjacent deleted lines?

From
Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Date
Jan 23, 2009, 10:32 UTC
Message-ID
<200901231132.36543.robin.rosenberg.lists@dewire.com>
In-Reply-To
<76718490901222318l7c3559ecje4a627fe2ff2ad12@mail.gmail.com>
fredag 23 januari 2009 08:18:15 skrev Jay Soffian:
> On Thu, Jan 22, 2009 at 3:13 PM, Robin Rosenberg
> <robin.rosenberg.lists@dewire.com> wrote:
[...]
Show 7 quoted lines
> > Try a three-way merge tool instead like, e.g. xxdiff.
> 
> opendiff (aka FileMerge) *is* a three-way merge tool. If the
> screenshot above is not clear, I'm not sure what would be. The left
> pane shows your copy of the file with only line1, line3, and line4.
> The right pane shows the other copy, with only line1, line2, and
> line4.

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

> 
> Shrug.
You have the option to ignore me....
-- robin
Previous: Jay SoffianNext: Jay Soffian
Message 7 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.