1 files changed, 7 insertions, 1 deletions
diff --git a/home/profiles/development/default.nix b/home/profiles/development/default.nix
index 4202f53..6b064b6 100644
--- a/home/profiles/development/default.nix
+++ b/home/profiles/development/default.nix
@@ -38,7 +38,13 @@ in
         pull.rebase = true;
 
         merge.conflictStyle = "diff3";
-        merge.tool = "nvimdiff";
+
+        mergetool.fugitive = {
+          cmd = ''nvim -f -c "Gvdiffsplit!" "$MERGED"'';
+          trustExitCode = true;
+        };
+
+        merge.tool = "fugitive";
         mergetool.prompt = false;
       };