From: Jay Soffian <jaysoffian@gmail.com>
Date: Fri, 23 Jan 2009 15:59:46 GMT
Subject: Re: Merging adjacent deleted lines?
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.