From eb21be2201f3f3ce7fac92ec12727773069dbadd Mon Sep 17 00:00:00 2001
From: Olexandr Smirnov <olexsmir@gmail.com>
Date: Fri, 22 Aug 2025 19:25:06 +0300
Subject: [PATCH] jj: use builtin merge-editor

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

diff --git a/config/jj/config.toml b/config/jj/config.toml
index cd0e0c3..5ebfbec 100644
--- a/config/jj/config.toml
+++ b/config/jj/config.toml
@@ -9,7 +9,6 @@ default-command = "l"
 editor = "nvim"
 pager = "delta"
 diff-formatter = ":git"
-merge-editor = ["nvim", "-d"]
 
 [signing]
 backend = "ssh"