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

use intellij as git mergetool

Browse source
This commit is contained in:
Salar Rahmanian 2025-01-26 21:13:14 -08:00
parent 407adf52c0
commit 365ed3db6b
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
programs/git/default.nix
View file

@ -20,11 +20,12 @@ let
};
fetch.prune = true;
init.defaultBranch = "main";
merge.conflictstyle = "zdiff3";
merge.tool = "nvim";
mergetool.nvim = {
cmd = "nvim -d -c \"wincmd l\" -c \"norm ]c\" \"$LOCAL\" \"$MERGED\" \"$REMOTE\"";
prompt = false;
merge.tool = "intellij";
mergetool = {
intellij = {
cmd = "'/Applications/IntelliJ IDEA.app/Contents/macOS/idea' merge \“$LOCAL\” \“$REMOTE\” \“$BASE\” \“$MERGED\”";
trustExitCode = true;
};
keepBackup = false;
};
pager = {