diff --git a/modules/home/jujutsu/default.nix b/modules/home/jujutsu/default.nix
index 986301b..a8419f5 100644
--- a/modules/home/jujutsu/default.nix
+++ b/modules/home/jujutsu/default.nix
@@ -51,6 +51,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";
         };
 
         # FIXME: git equivalents