On Fri, Jan 23, 2009 at 10:51 AM, Jay Soffian <jaysoffian@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
