add use vimdiff as git mergetool