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

[Dmitry Alexandrov]

martin rudalics <address@hidden> wrote:
>> * 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.

Ah, yes.  When I said ‘side by side’, I had not meant ‘split vertically’, just 
‘next to each other’, in this case: in the same frame.  Sorry for confusion.

signature.asc
Description: PGP signature