From 0cb0f6e798a886c9f59c7b91f424c41880bb0d9b Mon Sep 17 00:00:00 2001
From: Yax <1949284+kianby@users.noreply.github.com>
Date: Mon, 7 Feb 2022 15:24:46 +0100
Subject: [PATCH] git merge tool: meld

---
 dot_gitconfig.tmpl | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 03482e4..78322a7 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -34,3 +34,9 @@
   helper = store
 [credential "https://github.com"]
   helper = cache
+[mergetool "meld"]
+  cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
+[merge]
+  tool = meld
+
+