vimdiff

do Gets changes from another window

dp Put changes from current to another window

]c Jumps to next change

[c Jumps to previous change

CTRL + w Switches to the other windows

zr: reducing folding level

zm: one more folding level, please