Bear with me as I am a neophyte to Emacs. I followed http://pragmaticemacs.com/emacs/visualise-and-copy-differences-between-files/ to fire up Ediff in Emacs.
- It opened two buffers in two windows side-by-side.
- I then used p and n to move to the hunks and used b to copy from B to A file.
- I then used
C-x oto move to the edited buffer and used
C-x C-sto save it and then I am lost..
I want to go back to ediff-mode and want to use special keys p, n, etc. Now when I am trying to hit these keys it starts editing the buffers even the ediff help key ? is not working.
How can I get back to ediff-mode from this edit kind of mode?