use vimdiff
updated vim submodule