Commands and keys for a 3-way merge in vim / vimdiff
Keep forgetting these and all the sites mentioning vimdiff tend to be focussed on comparing 2 files.
Buffers are numbered 1,2,3
Move to the next window: <c>+w <c>+w
Get diff from window 2 :diffget 2
Put diff into window 3 :diffput 3
Update all windows (it sometimes gets a bit out of sync) :diffupdate
