Post date: Jan 18, 2011 4:19:14 PM
Small cheat sheet for using vimdiff
vimdiff - edit two or three versions of a file with Vim and show differences
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