diff --git a/git/gitconfig.include b/git/gitconfig.include
index 2b7386b..55dc639 100644
--- a/git/gitconfig.include
+++ b/git/gitconfig.include
@@ -5,4 +5,8 @@
 	st = status
 	lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 	ll = log --stat --abbrev-commit
+[diff]
+	tool = vimdiff
+[merge]
+	tool = vimdiff
 # vim: set filetype=gitconfig: