1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 13f29c4..99a675c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -14,6 +14,8 @@
   helper = !pass 'fastmail/git'
 [color]
 	ui = false
+[merge]
+	tool = meld
 [mergetool]
 	layout = LOCAL,MERGED,REMOTE
 [sendemail]