softinio/nix-config
1
0
Fork 0
mirror of https://github.com/softinio/nix-config.git synced 2025-08-31 23:06:40 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updates

Browse source
This commit is contained in:
Salar Rahmanian 2021-09-02 22:13:27 -07:00
parent 7ab92e2f76
commit 83c571cbff
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
programs/git/default.nix
View file

@ -6,6 +6,7 @@ let
editor = "nvim";
pager = "diff-so-fancy | less --tabs=4 -RFX";
};
init.defaultBranch = "main";
merge.tool = "intellij";
mergetool = {
cmd = "idea merge \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"";