From: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
To: Jay Soffian <jaysoffian@gmail.com>
Cc: Jonathan del Strother <maillist@steelskies.com>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: Merging adjacent deleted lines?
Date: Fri, 23 Jan 2009 11:32:36 +0100 [thread overview]
Message-ID: <200901231132.36543.robin.rosenberg.lists@dewire.com> (raw)
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:
[...]
> > 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
next prev parent reply other threads:[~2009-01-23 10:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-21 19:20 Merging adjacent deleted lines? Jonathan del Strother
2009-01-21 19:49 ` Robin Rosenberg
2009-01-21 21:08 ` Junio C Hamano
2009-01-22 10:57 ` Jonathan del Strother
2009-01-22 20:13 ` Robin Rosenberg
2009-01-23 7:18 ` Jay Soffian
2009-01-23 10:32 ` Robin Rosenberg [this message]
2009-01-23 15:51 ` Jay Soffian
2009-01-23 15:59 ` Jay Soffian
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200901231132.36543.robin.rosenberg.lists@dewire.com \
--to=robin.rosenberg.lists@dewire.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jaysoffian@gmail.com \
--cc=maillist@steelskies.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).