From 22931cf7910abee031c36ead241dd534da83adfc Mon Sep 17 00:00:00 2001
From: Magdalena Szweda <hi@roughlynamed.net>
Date: Thu, 8 Oct 2026 20:32:02 +0200
Subject: jj(diff): Make the custom ediff command the standard diff/merge tool
 for jj

---
 jj/.config/jj/config.toml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml
index 406b9b6..47a2e61 100644
--- a/jj/.config/jj/config.toml
+++ b/jj/.config/jj/config.toml
@@ -19,3 +19,10 @@ 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