changed git mergetool from vimdiff3 to vimdiff