git: set nvimdiff2 as difftool

hyshka · Dec 2, 2024 · 5e6a726 · 5e6a726
1 parent 80c6a63
commit 5e6a726
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/home/cli/git.nix b/home/cli/git.nix
@@ -20,6 +20,7 @@
       merge.ff = "only";
       merge.conflictstyle = "zdiff3";
       mergetool.keepBackup = false;
+      merge.tool = "nvimdiff2";
       merge.mergiraf.name = "mergiraf";
       merge.mergiraf.driver = "mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P";
     };