Update things

2025-04-28 13:55:41 +02:00
parent 05d3d997dc
commit 7de0c50a3a
9 changed files with 81 additions and 17 deletions
--- a/nix/user/git.nix
+++ b/nix/user/git.nix
@ -54,8 +54,6 @@
      merge.conflictstyle = "zdiff3";
      core.editor = "nvim";
      init.defaultBranch = "main";
-      merge.conflicstyle = "zdiff3";
-      fetch.prune = true;
    };

    ignores = [