From b3ab5ccdc6e409a79bb5e3d675ed2bebbc8ba22a Mon Sep 17 00:00:00 2001
From: Alexandre Tuleu <alexandre.tuleu.2005@polytechnique.org>
Date: Wed, 5 Oct 2022 08:00:07 +0200
Subject: [PATCH] Sets mergetool

---
 .config/git/config | 2 ++
 1 file changed, 2 insertions(+)

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