Sets mergetool

2022-10-05 08:00:07 +02:00
parent 3ac6f09fa7
commit b3ab5ccdc6
1 changed files with 2 additions and 0 deletions
--- a/.config/git/config
+++ b/.config/git/config
@@ -3,3 +3,5 @@
 	email = alexandre.tuleu.2005@polytechnique.org
 [credential]
 	helper = cache
+[merge]
+	tool = meld