From e90cbb49479f1f4b572bc50715c854f9deb619c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <j@sanchezrada.es>
Date: Wed, 10 Jun 2026 23:06:27 +0200
Subject: [PATCH] jj: use meld for conflict resolution

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

diff --git a/jj/.config/jj/config.toml b/jj/.config/jj/config.toml
index 6d97a0e..aa63de7 100644
--- a/jj/.config/jj/config.toml
+++ b/jj/.config/jj/config.toml
@@ -18,13 +18,14 @@ f = ["git", "fetch"]
 p = ["git", "push"]
 
 [ui]
-pager = "delta" #":builtin"
-diff-formatter=":git"
+pager = "delta"
+diff-formatter = "delta"
 paginate = "auto"
 default-command = ["log", "--reversed"]
+merge-editor = "meld"
 
 [merge-tools.delta]
-diff-args=["--color-only", "--side-by-side", "$left", "$right", "--width=$width"]
+diff-args = ["--side-by-side", "$left", "$right", "--width=$width"]
 
 [revset-aliases]
 'private_commits()' = "description('[local]')"