vimdiff essentials

Change window: Twice Ctrl+W
Scale both windows to the same size: Ctrl+W,=
Put „Diff“ to the other window („diff put“): dp
Get „Diff“ from other window („diff obtain“): do