From 4d997f4ba92c57b9880bafb07ba99c35083b92d2 Mon Sep 17 00:00:00 2001
From: Fabio Scotto di Santolo <fabio.scottodisantolo@gmail.com>
Date: Thu, 7 Aug 2025 19:17:49 +0200
Subject: [PATCH] Set Meld as default diff and merge tool for Git

---
 git/.gitconfig | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/git/.gitconfig b/git/.gitconfig
index ded8454..b6bd0e2 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -25,6 +25,13 @@
 
 [merge]
   conflictstyle = diff3
+  tool = meld
+
+[mergetool]
+  prompt = false
+
+[diff]
+  tool = meld
 
 [color]
   ui = always