diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index b604a66ef..fc86ae1b7 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -99,6 +99,8 @@ alias gpoat='git push origin --all && git push origin --tags'
 compdef _git gpoat=git-push
 alias gmt='git mergetool --no-prompt'
 compdef _git gmt=git-mergetool
+alias gmtvim='git mergetool --no-prompt --tool=vimdiff'
+compdef _git gmtvim=git-mergetool
 
 alias gg='git gui citool'
 compdef _git gg='git gui'