diff --git a/hm_modules/git.nix b/hm_modules/git.nix index edad598..e5d8fb0 100644 --- a/hm_modules/git.nix +++ b/hm_modules/git.nix @@ -106,7 +106,7 @@ in # delta.side-by-side = true; diff.colorMoved = "default"; diff.guitool = "meld"; - init.defaultBranch = "main"; + # init.defaultBranch = "main"; merge.conflictstyle = "diff3"; merge.guitool = "meld"; merge.tool = "meld";