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'";
     };
   };
 }