From 747a44d61ebd199f5022b6f7c5d490a4ccc6fea6 Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Tue, 23 May 2023 22:04:32 +0300
Subject: [PATCH] Add meld as git (merge|diff)tool

---
 home/.config/git/config | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/home/.config/git/config b/home/.config/git/config
index dc51040f..00409637 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -21,19 +21,30 @@
 [merge]
 	prompt = false
   conflictstyle = diff3
-	tool = nvim-merge
+	tool = meld
 
-[mergetool "nvim-merge"]
-	cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+[mergetool]
 	keepBackup = false
+	prompt = false
+
+[mergetool "nvim"]
+	cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
+
+[mergetool "meld"]
+  cmd = meld --diff $LOCAL $MERGED $REMOTE --diff $BASE $LOCAL --diff $BASE $REMOTE
 
 [diff]
-	prompt = false
-	tool = nvim-diff
+	tool = meld
 
-[difftool "nvim-diff"]
+[difftool]
+	prompt = false
+
+[difftool "nvim"]
 	cmd = nvim -d $LOCAL $REMOTE
 
+[difftool "meld"]
+  cmd = meld --diff $LOCAL $REMOTE
+
 [pull]
 	rebase = merges