diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 03482e4..78322a7 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -34,3 +34,9 @@
   helper = store
 [credential "https://github.com"]
   helper = cache
+[mergetool "meld"]
+  cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
+[merge]
+  tool = meld
+
+