diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common
index 4e72e709..89af94c6 100644
--- a/.gitconfig_includes.common
+++ b/.gitconfig_includes.common
@@ -18,6 +18,8 @@
     tool = vimdiff
 [difftool]
     prompt = false
+[difftool "vimdiff"]
+    cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off'
 [merge]
     tool = kdiff3
 [mergetool]
diff --git a/.gitmodules b/.gitmodules
index ab3767b7..c392ee46 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -41,3 +41,6 @@
 [submodule ".vim/bundle/splice"]
 	path = .vim/bundle/splice
 	url = https://github.com/sjl/splice.vim.git
+[submodule ".vim/bundle/vim-dirdiff"]
+	path = .vim/bundle/vim-dirdiff
+	url = git://github.com/will133/vim-dirdiff
diff --git a/.vim/bundle/vim-dirdiff b/.vim/bundle/vim-dirdiff
new file mode 160000
index 00000000..779185c3
--- /dev/null
+++ b/.vim/bundle/vim-dirdiff
@@ -0,0 +1 @@
+Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4