vimdiff

[c	jump to previous hunk
]c	jump to next hunk
dp	shorthand for `:diffput`
do
:only	close all windows apart from the current one
:Gwrite[!]	write the current file to the index
ctr w - siwtch between buffers .