use vimdiff for diff,merge