added git merge backup settings

2025-06-12 13:01:59 -04:00
parent 4afb47e881
commit 8785247675
1 changed files with 1 additions and 0 deletions
--- a/home/git.nix
+++ b/home/git.nix
@ -17,6 +17,7 @@
      push.autoSetupRemote = true;
      pull.merge = true;
      merge.tool = "nvimdiff";
+      mergetool.keepBackup = false;
    };

    ignores = [