From 8785247675b16eae4b72faf7aba8f692b4ef6d81 Mon Sep 17 00:00:00 2001
From: "Wyatt J. Miller" <wyatt@wyattjmiller.com>
Date: Thu, 12 Jun 2025 13:01:59 -0400
Subject: [PATCH] added git merge backup settings

---
 home/git.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/home/git.nix b/home/git.nix
index 3f70aaa..7c3504a 100644
--- 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 = [