use intellij as git mergetool

programs/git/default.nix

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