motiejus
/
config
1
Fork 0
Code Packages Releases Activity

git: merge.conflictstyle = "zdiff3"

This commit is contained in:
Motiejus Jakštys 2024-02-14 11:18:49 +02:00
parent e317ad9e0f
commit 0c799ee87a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shared/home/default.nix
View File

@ -153,7 +153,7 @@ in {
extraConfig = { extraConfig = {
rerere.enabled = true; rerere.enabled = true;
pull.ff = "only"; pull.ff = "only";
merge.conflictstyle = "diff3"; merge.conflictstyle = "zdiff3";
init.defaultBranch = "main"; init.defaultBranch = "main";
}; };
}; };