From a008c9b73b3c231b0766051ca92b45d2bf0bd3b3 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 7d44352..7d1928d 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -43,6 +43,8 @@ in
         ui = {
           # Stop nagging me about it, though I am not a fan of its UI.
           diff-editor = ":builtin";
+          # Stop nagging me about it, though I am not a fan of its UI.
+          merge-editor = ":builtin";
         };
 
         templates = {