関連ワード:  vimdiff get all changes from remote    vimdiff apply changes  
結果 : vimdiff get all changes from remote