From e28fb54e037cf2b5682b4c84f2010aaadbf5137c Mon Sep 17 00:00:00 2001
From: Heavy <heavy@uber.space>
Date: Wed, 9 Jun 2021 10:54:18 +0200
Subject: [PATCH] Added 'meld' as mergetool on Linux.

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

diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
index 803a817..e5d54f5 100644
--- a/dot_gitconfig.tmpl
+++ b/dot_gitconfig.tmpl
@@ -83,6 +83,15 @@
     cmd = "'c:/PortableApps/PortableApps/WinMergePortable/App/WinMerge/WinMergeU'" -e "$LOCAL" "$REMOTE"
 
 {{ end -}}
+{{ if eq .chezmoi.os "linux" -}}
+# see https://stackoverflow.com/questions/34119866/setting-up-and-using-meld-as-your-git-difftool-and-mergetool
+[merge]
+    tool = meld
+
+[mergetool "meld"]
+    cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
+    # cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
+{{ end -}}
 
 [http]
     # proxy = http://host:port