Changed git mergetool to vimdiff from gvimdiff.