diff --git a/git/config b/git/config
index 1d8e471..23ae333 100644
--- a/git/config
+++ b/git/config
@@ -27,6 +27,8 @@
 	conflictstyle = diff3
 [mergetool]
 	keepBackup = false
+[mergetool "vimdiff"]
+        layout = "LOCAL,BASE,REMOTE / MERGED + LOCAL,REMOTE + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"
 [credential]
 	helper = cache
 [help]