vim diff - RawIron/rawiron.github.io GitHub Wiki

]c " Go to next block of diff
[c " Go to previous block of diff
dp " Push this version of the current block into the other pane
do " Use the block from the other pane in this pane