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; };