diff --git a/modules/hm/git.nix b/modules/hm/git.nix index 1a0ad55..b17bb24 100644 --- a/modules/hm/git.nix +++ b/modules/hm/git.nix @@ -117,7 +117,7 @@ in guitool = "meld"; tool = "meld"; }; - # init.defaultBranch = "main"; + init.defaultBranch = "main"; merge = { conflictstyle = "diff3"; guitool = "meld";