daniel/dotfiles
1
0
Fork 0
Code Activity Actions

git: use zdiff3
All checks were successful
Build / build-arm64-linux (push) Successful in 9m19s
Details
Build / build-amd64-linux (push) Successful in 36m44s
Details

Browse source
This commit is contained in:
Daniel Kempkens 2023-11-07 12:36:04 +01:00
parent 3e4d7c198c
commit 5ff0781b10
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
home/programs/git.nix
View file

@ -40,6 +40,10 @@
whitespace = "fix"; whitespace = "fix";
}; };
merge = {
conflictStyle = "zdiff3";
};
rerere = { rerere = {
enabled = true; enabled = true;
}; };