diff --git a/git/.gitconfig b/git/.gitconfig
index ded8454..b6bd0e2 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -25,6 +25,13 @@
 
 [merge]
   conflictstyle = diff3
+  tool = meld
+
+[mergetool]
+  prompt = false
+
+[diff]
+  tool = meld
 
 [color]
   ui = always