diff --git a/.config/git/config b/.config/git/config
index 4f289e8..ca10169 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -3,3 +3,5 @@
 	email = alexandre.tuleu.2005@polytechnique.org
 [credential]
 	helper = cache
+[merge]
+	tool = meld