From d5e7291b825ec6b97d5d2410fe493e9d26bdafe5 Mon Sep 17 00:00:00 2001 From: RGBCube Date: Mon, 20 Jan 2025 16:30:58 +0300 Subject: [PATCH] Set the jujutsu diff editor explicitly to :builtin --- modules/common/jujutsu.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common/jujutsu.nix b/modules/common/jujutsu.nix index 591ed85..e22ff7b 100644 --- a/modules/common/jujutsu.nix +++ b/modules/common/jujutsu.nix @@ -21,6 +21,7 @@ in { user.email = "git@${mailDomain}"; ui.default-command = "log"; + ui.diff-editor = ":builtin"; ui.diff.tool = [ "${getExe pkgs.difftastic}" "--color" "always" "$left" "$right" ]; ui.conflict-marker-style = "snapshot";