From ef525a09ca72139f0a400f3fa9b1186b9a3dd842 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 26 Nov 2025 11:13:10 +0000
Subject: [PATCH] home: jujutsu: set 'ui.merge-editor'

Same reason as `ui.diff-editor`.
---
 modules/home/jujutsu/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index d24b5ca..1472e3b 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -45,6 +45,8 @@ in
           diff-editor = ":builtin";
           # I don't like word-diff
           diff-formatter = ":git";
+          # Stop nagging me about it, though I am not a fan of its UI.
+          merge-editor = ":builtin";
           # Does not honor `$PAGER` (anymore)
           pager = lib.mkDefault config.home.sessionVariables.PAGER;
         };