diff --git a/.gitconfig b/.gitconfig
index 15b698d..22b222d 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,3 +14,5 @@
 	editor = vim
 [diff]
 	tool = meld
+[merge]
+	tool = meld