From 00320b8a484117196057eb8311bae3a6bfe99ff6 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Mon, 21 Feb 2022 13:39:22 +0100
Subject: [PATCH] Use my own git diff setup

That one includes local base and remote at top.
It turns diffthis off for the merged result to have proper code
highlighting of result.
---
 home/programs/git.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index 6ac67ac..e5a5b96 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -107,7 +107,11 @@
 
     merge = {
       ff = true;
-      tool = "nvimdiff";
+      tool = "nvimdiff4";
+    };
+
+    "mergetool \"nvimdiff4\"" = {
+      cmd = "nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
     };
   };
 }