Paul - The Programmer

simple & stupid

merge code with vimdiff

#update difference

:diffupdate

# merge difference from another buffer to current buffer

:diffget                

do

#merge difference from current buffer to another buffer

:diffput

dp