From b795eb80479202e15293ff1d8b0262a678fe0d99 Mon Sep 17 00:00:00 2001
From: Jack Platten <jack@platten.me>
Date: Tue, 28 Jul 2026 09:34:56 -0700
Subject: [PATCH] Update .config/jj/config.toml

---
 private_dot_config/jj/config.toml.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/private_dot_config/jj/config.toml.tmpl b/private_dot_config/jj/config.toml.tmpl
index 0621360..5037cbe 100644
--- a/private_dot_config/jj/config.toml.tmpl
+++ b/private_dot_config/jj/config.toml.tmpl
@@ -12,8 +12,8 @@ diff-editor = ":builtin"
 # fixes nerd icons in less pager
 pager = { command = ["less", "-FRX"], env = { LESSCHARSET = "utf-8", LESSUTFCHARDEF = "E000-F8FF:p,F0000-FFFFD:p,100000-10FFFD:p" } }
 {{ if eq .chezmoi.os "darwin" -}}
-merge-editor = "ksdiff"
-[merge-tools.ksdiff]
+[merge-tools.kaleidoscope]
+program = "ksdiff"
 diff-invocation-mode = "file-by-file"
 diff-args = ["--partial-changeset", "$left", "$right"]
 merge-args = ["--merge", "--output", "$output", "--base", "$base", "$left", "$right"]
-- 
2.51.2