vimdiff 實用指令

• do - Get changes from other window into the current window.
• dp - Put the changes from current window into the other window.
• ]c - Jump to the next change.
• [c - Jump to the previous change.
• Ctrl W + Ctrl W - Switch to the other split window.
• :diffupdate – diff update
• :syntax off – syntax off
• zo – open folded text
• zc – close folded text

http://blog.longwin.com.tw/2009/11/vimdiff-vs-git-diff-2009/