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

feat: use mergiraf

Browse source 
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
This commit is contained in:
Lander Van den Bulcke 2025-09-19 10:09:42 +02:00
parent 49a41b42a6
commit c54dce3817
Signed by: lander
GPG key ID: 0142722B4B0C536F
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
home/lander/features/cli/git/default.nix
View file

@ -61,6 +61,9 @@ in
# sign your commits! # sign your commits!
commit.gpgsign = true; commit.gpgsign = true;
# diff3 merge
merge.conflictStyle = "diff3";
}; };
# This is optional, as `git identity` will call the `git-identity` script by itself, however # This is optional, as `git identity` will call the `git-identity` script by itself, however
@ -76,4 +79,7 @@ in
enableAsDifftool = true; enableAsDifftool = true;
}; };
}; };
# use mergiraf
programs.mergiraf.enable = true;
} }