Better git mergetool with vimdiff