From 365ed3db6b781443a5d5964cf8351b5181a64ed5 Mon Sep 17 00:00:00 2001
From: Salar Rahmanian <code@softinio.com>
Date: Sun, 26 Jan 2025 21:13:14 -0800
Subject: [PATCH] use intellij as git mergetool

---
 programs/git/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/programs/git/default.nix b/programs/git/default.nix
index fa25b40..a57b515 100644
--- a/programs/git/default.nix
+++ b/programs/git/default.nix
@@ -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 = {