From 7f67d28e18760154778f20da43772838c36734ed Mon Sep 17 00:00:00 2001
From: Matt Singleton <matt@xcolour.net>
Date: Thu, 11 Apr 2024 09:57:22 -0500
Subject: vimdiff for git mergetool

---
 config/all/git/config | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'config/all/git')

diff --git a/config/all/git/config b/config/all/git/config
index 0a3bed8..71bf668 100644
--- a/config/all/git/config
+++ b/config/all/git/config
@@ -27,11 +27,17 @@
     keepTemporaries = false
     prompt = false
 
+[mergetool "vimdiff"]
+    layout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE"
+
 [merge]
-    tool = meld
+    tool = vimdiff
+    conflictstyle = zdiff3
 
 [diff]
-    tool = meld
+    tool = vimdiff
+    colorMoved = default
+    algorithm = histogram
 
 [init]
     defaultBranch = main
-- 
cgit v1.2.3