From 8da12a219edf958bf050e952647393840c83ff16 Mon Sep 17 00:00:00 2001
From: Magdalena Szweda <hi@roughlynamed.net>
Date: Mon, 19 Oct 2026 15:06:47 +0200
Subject: Jj(split): Remove ediff as the default split/merge tool

---
 jj/.config/jj/config.toml | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'jj')

diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml
index 638050d..fc65527 100644
--- a/jj/.config/jj/config.toml
+++ b/jj/.config/jj/config.toml
@@ -23,10 +23,5 @@ pushall = ["util", "exec", "--", "sh", "-c", '''
 
 [ui]
 default-command = "log"
-diff-editor = "ediff"
 diff-instructions = false
 
-[merge-tools.ediff]
-program = "emacs"
-edit-args = ["-l", "/home/hi/.config/jj/ediff-split.el",
-             "-f", "jj-ediff-split", "$left", "$right"]
-- 
cgit v1.2.3