all repos — nixfiles @ 2e572a74a7e3e3cbc53356b055280f333a6d655c

System and user configuration, managed by nix and home-manager

update inputs

Alan Pearce
commit

2e572a74a7e3e3cbc53356b055280f333a6d655c

parent

5a432fefbf2129ecead2ac17bdca2a5feb7b9400

1 file changed, 2 insertions(+), 1 deletion(-)

changed files
M user/settings/git.nix → user/settings/git.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }:
 {

@@ -56,7 +57,7 @@ enabled = true;
         autoupdate = true;
       };
       merge = {
-        conflictStyle = "zdiff3";
+        conflictStyle = lib.mkDefault "zdiff3";
       };
       diff = {
         algorithm = "histogram";