By Forrest Smith - Drempd.com
Honestly, the vimdiff window looks like a mess, even editing there is hard. But you can make your changes in the bottom window (I think using a backspace didn’t work but you can hit the delete button).
Saving the vimdiff changes you made, enter: “:wqa” (I guess there is actually a command prompt at the bottom which is where this gets entred).