Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enable diff3 for git

This commit is contained in:
Andreas Zweili 2023-11-07 21:26:59 +01:00
parent 8aa9fb53e5
commit 67a27854b8
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
home-manager/modules/programs/git/default.nix
View File

@ -44,6 +44,7 @@ in
push = {
autoSetupRemote = true;
};
merge.conflictStyle = "diff3";
};
ignores = [
# ---> VisualStudioCode