bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Git: default branch

Browse source
This commit is contained in:
Filippo Berto 2024-11-29 16:06:22 +01:00
parent 5b10bcce64
commit f99034752e
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/hm/git.nix
View file

@ -117,7 +117,7 @@ in
guitool = "meld"; guitool = "meld";
tool = "meld"; tool = "meld";
}; };
# init.defaultBranch = "main"; init.defaultBranch = "main";
merge = { merge = {
conflictstyle = "diff3"; conflictstyle = "diff3";
guitool = "meld"; guitool = "meld";