Vimdiff essential keys

  • do - get changes from other window to current
  • dp - put changes current window to other
  • ]c - jump to next change
  • [c - jump to previous change

Fold

  • zf - create selected fold
  • zd - delete current fold

surround

Retab

:set tabstop=4 shiftwidth=4 expandtab
:retab