>>>>> "DL" == Dan LaManna <address@hidden> writes:

DL> I've been using ediff to resolve merge conflicts in git and it has the
DL> typical windows: ours, theirs, and merged results. However, I often want
DL> to see a 4th window (I believe this is called a 4 way diff) which is the
DL> common ancestor of ours and theirs (A and B). I believe such functionality
DL> exists in vimdiff - is there an ediff (or other emacs tool) offering
DL> similar functionality to this?

Based on this stack overflow answer, maybe not yet:

http://stackoverflow.com/questions/15587595/can-ediff-merge-simultaneously-show-the-ancestor-a-b-and-merge-buffers