New answers tagged ediff
1
You're looking for ediff-setup-windows-plain, which does everything in one frame.
M-x customize-variable RET ediff-window-setup-function and set the value to ediff-setup-windows-plain.
Top 50 recent answers are included