diff --git a/pkgs/dev/git/default.nix b/pkgs/dev/git/default.nix index 3c8b8d7d3b4460442090f1be212496ad91d09aa5..928b3930528ef5d0dbc3221a61eeac089aee7411 100644 --- a/pkgs/dev/git/default.nix +++ b/pkgs/dev/git/default.nix @@ -44,7 +44,7 @@ # For supercede core.symlinks = true; safe.directory = "/etc/nixos"; - merge.conflictstyle = "diff3" + merge.conflictstyle = "diff3"; }; }; @@ -93,7 +93,7 @@ # For supercede core.symlinks = true; safe.directory = "/etc/nixos"; - merge.conflictstyle = "diff3" + merge.conflictstyle = "diff3"; }; };