From: Jay Soffian <jaysoffian@gmail.com>
To: Robin Rosenberg <robin.rosenberg.lists@dewire.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 10:59:46 -0500 [thread overview]
Message-ID: <76718490901230759k25c4d0c9t57c648f3e373c5bb@mail.gmail.com> (raw)
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.
prev parent reply other threads:[~2009-01-23 16:01 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
2009-01-23 15:51 ` Jay Soffian
2009-01-23 15:59 ` Jay Soffian [this message]
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=76718490901230759k25c4d0c9t57c648f3e373c5bb@mail.gmail.com \
--to=jaysoffian@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=maillist@steelskies.com \
--cc=robin.rosenberg.lists@dewire.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).