From 45513367674358e74b3052154fbb9a52b6554dbe Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 13 Apr 2025 13:54:12 +0100
Subject: [PATCH] chore(gitconfig): update Kaleidoscope related settings

---
 gitconfig | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 34d31b5..605b858 100644
--- a/gitconfig
+++ b/gitconfig
@@ -42,7 +42,7 @@
 [pull]
 	rebase = true
 [difftool "Kaleidoscope"]
-	cmd = ksdiff-wrapper git \"$LOCAL\" \"$REMOTE\"
+	cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [difftool]
 	prompt = false
 [diff]
@@ -76,6 +76,13 @@
 [credential "https://gist.github.com"]
 	helper =
 	helper = !op plugin run -- gh auth git-credential
+[merge]
+	tool = Kaleidoscope
+[mergetool "Kaleidoscope"]
+	cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+	trustExitCode = true
+[mergetool]
+	prompt = false
 [gitbutler]
 	aiModelProvider = anthropic
 	aiAnthropicKeyOption = bringYourOwn