From 3783cab095a9167256afcbfe987d11f35a7003b1 Mon Sep 17 00:00:00 2001
From: Marc Coquand <marc@mccd.space>
Date: Thu, 5 Sep 2024 12:15:30 -0500
Subject: changes

---
 gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index 13f29c4..99a675c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -14,6 +14,8 @@
   helper = !pass 'fastmail/git'
 [color]
 	ui = false
+[merge]
+	tool = meld
 [mergetool]
 	layout = LOCAL,MERGED,REMOTE
 [sendemail]
-- 
cgit v1.2.3