poz/niksos
poz/niksos
1
3
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

zdiff3 for merge conflicts

Browse source
This commit is contained in:
jacekpoz 2024-02-17 16:15:33 +01:00
parent 0be0c8500e
commit 01ae9f1db2
No known key found for this signature in database
GPG key ID: 94E812A8B12AAE3C
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/cli/git.nix
View file

@ -50,6 +50,7 @@ in {
init.defaultBranch = cfg.defaultBranch; init.defaultBranch = cfg.defaultBranch;
push.autoSetupRemote = true; push.autoSetupRemote = true;
commit.verbose = true; commit.verbose = true;
merge.conflictstyle = "zdiff3";
interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only"; interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only";
}; };
} }