On Fri, Jan 23, 2009 at 5:32 AM, Robin Rosenberg <robin.rosenberg.lists@xxxxxxxxxx> wrote: > Where's the ancestor? I'm used to having four panes for doing three-way > merges, but your screenshot showed only three. I installed xxdiff to compare w/opendiff, meld, and vimdiff and I see what you mean with xxdiff. 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. >> Shrug. > > You have the option to ignore me.... Doh, I meant only "I don't understand." My apologies. 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