HOWTO: Use vimdiff1

a) Basic control:

    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

    diffoff        - disable highlighting
    windo diffthis - enable highlighting

Only two files: you can copy differences with `:diffget` and `:diffput`.

b) Obtain all differences from other file:

    :%diffget OTHER

  1. Based on andrejk.blogspot.fr. ↩