about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--modules/user/aszlig/profiles/workstation/default.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix
index 359ef82f..e08b9b30 100644
--- a/modules/user/aszlig/profiles/workstation/default.nix
+++ b/modules/user/aszlig/profiles/workstation/default.nix
@@ -92,6 +92,7 @@ in {
 
       merge.tool = "vimdiff3";
       merge.conflictstyle = "diff3";
+      mergetool.keepBackup = false;
 
       delta = {
         commit-decoration-style = "bold yellow box";