From 7f54434d32b689088a591b99e1083dc29594fa67 Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Tue, 5 Mar 2024 07:32:04 +0100
Subject: [PATCH] Configure simplified git mergetool

I still use neovim, but thanks to zdiff3 diffstyle there is no need for
a 3 way diff as UI.
I can use the final result as simple file instead, which I did for a
long time already.
But now I get rid of the unnecessary files and buffers.
---
 home/programs/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index b2957c1..4af501d 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -135,11 +135,11 @@
     merge = {
       ff = true;
       conflictstyle = "zdiff3";
-      tool = "nvimdiff4";
+      tool = "nvim";
     };
 
-    "mergetool \"nvimdiff4\"" = {
-      cmd = "nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J' -c 'diffoff'";
+    "mergetool \"nvim\"" = {
+      cmd = "nvim $MERGED";
     };
   };
 }