Re: Making git as easy as CVS, for handling merge conflicts

[martin rudalics]

> * ediff-setup-windows-plain-merge(#<buffer init.el> #<buffer init.el~> #<buffer 
*ediff-merge*> #<buffer *Ediff Control Panel*>)

But 'ediff-setup-windows-plain-merge' here shows only buf-A and buf-B
side by side.  It shows buf-C below these two and control-buffer at
the bottom of the frame.  I get the same setup on a GUI frame when I
set 'ediff-window-setup-function' to 'ediff-setup-windows-plain'.

Looking at the code I cannot see any indication that three side-by-side
windows could be created.  Can you resolve this mystery by walking
through 'ediff-setup-windows-plain-merge' and looking at the splits it
does for you?

Thanks, martin