Ctrl w (twice) Toggle windows
do Short for "diff obtain", but I think of "other", because it pulls the change under the cursor from other window into the focused window.
dp Short for "diff put", but I think of "push", because it pushes changes from the focused window to non-focused window.
]c Jump forward to the next change.
[c Jump bacwards to the previous change.
:xa Save and quit both windows.