Vimdiff i Emacs

Vimdiff działa na konsoli i całkiem fajnie. Manipulacja oknami też spoko. Ale Emacs to tragedia jeśli chodzi o podobną funkcjonalność. Poniżej fragment z pliku http://karl-voit.at/vim-emacs-cheatsheet_of_freezing_hell.txt

------------------------------------------------------ Compare/merge differencesstart file A and B in compare mode    vimdiff A B           emerge A B

emacs: goto fast-mode (C-c C-c doesn't have to be used)     C-c C-c f

emacs: goto edit-mode                                       e

next difference                       ]c                    (C-c C-c) n

previous difference                   [c                    (C-c C-c) p

goto difference X                                           C-u X j

change to left file (higher)          C-w h

change to right file (lower)          C-w l

take this version                     :[range]diffpu(t)  dp

take other version                    :[range]diffg(et)  do

take A-version                                              (C-c C-c) a

take B-version                                              (C-c C-c) b

quit without saving the merge                               C-]

recenter buffers                                            l

emacs: http://www.cs.cmu.edu/cgi-bin/info2www?(emacs)Merge%20Commands

Poniżej jeszcze fragment komentarza, jak używać vimdiff

Little hints for newbies:
ctrl+w ctrl+w - switch windows
do - diff obtain
dp - diff put
[c - previous difference
]c - next difference
:diffupdate - diff update 
:syntax off - syntax off
zo - open folded text
zc - close folded text

Nadal szukam sposobu w Emacsie, aby było łatwo jak vimdiff.

Emacs nie jest nawet tu uwzględniony.