Diffing with Vim

Cheat sheet for keystrokes, vim options, etc for working with file differences using Vim (better known as vimdiff).

vimdiff keystroke commands

]c            - next difference
[c            - previous difference
do            - diff obtain
dp            - diff put
zo            - open folded text
zc            - close folded text
:diffupdate   - re-scan the files for differences
<Ctrl> ww     - Switch between windows
:set diffopt+=iwhite    - ignore whitespaces in diff
:set syn=ff   - switch off colours in current window

References

• Based on vimdiff.md by https://gist.github.com/mattratleph/
• Vimdiff help page