vim diff for git diff
merge from remote