1 files changed, 18 insertions, 0 deletions
diff --git a/git/.gitconfig b/git/.gitconfig
index 58dcb03..4d656b1 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,21 @@
 # Please adapt and uncomment the following lines:
 	name = Miguel
 	email = m.i@gmx.at
+[merge]
+    tool = vimdiff
+    conflictstyle = diff3
+
+
+[mergetool]
+  prompt = true
+
+[mergetool "vimdiff"]
+  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd w' -c '$wincmd w' -c '$wincmd J'
+
+[difftool]
+    prompt = false
+
+[diff]
+    tool = vimdiff
+    
+