sorceress
/
nix-infra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use zdiff3 in git

This commit is contained in:
Agatha Lovelace 2024-01-30 23:17:16 +01:00
parent 264896aba7
commit c0f6d1ea7e
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/home_manager/common.nix
View File

@ -38,6 +38,7 @@
extraConfig = { extraConfig = {
init = { defaultBranch = "mistress"; }; init = { defaultBranch = "mistress"; };
core = { editor = "hx"; }; core = { editor = "hx"; };
merge.conflictStyle = "zdiff3";
rebase.autosquash = true; rebase.autosquash = true;
pull.rebase = true; pull.rebase = true;
}; };