Add task reports; Add git diff setup

2024-09-23 08:25:51 +02:00
parent 85c6ae78fb
commit f23c3d413b
3 changed files with 32 additions and 14 deletions
--- a/nix/user/git.nix
+++ b/nix/user/git.nix
@ -23,6 +23,7 @@
      };
      push.default = "matching";
      init.defaultBranch = "main";
+      merge.conflicstyle = "zdiff3";
    };

    ignores = [