I've started using vimdiff today, and wanted to do some of the things that I've taken for granted on Windows based diff editors (like expand/collapse a diff section, have full file expansion/only diffs with 3 context lines above or below, etc.). I currently know only the following commands :

Keyboard Shortcuts:

d o - Get changes from other window into the current window.

d p - Put the changes from current window into the other window.

] c - Jump to the next change.

[ c - Jump to the previous change.

CTRL + W , w - Switch to the other split window ( CTRL + W , CTRL + W does the same thing, in case you let go of the CTRL key a bit later)

Could someone point me to the right direction so I could replicate similar features?

It would be nice if I could expand/collapse lines around the diffs, for example.