feat(jujutsu): compatibility with jj-vc.el in Emacs

2025-09-03 11:45:12 +02:00 · 2025-09-03 11:45:12 +02:00 · 7d198f1996
commit 7d198f1996
parent 2e84738c9f
1 changed files with 3 additions and 0 deletions
--- a/users/modules/dev/vcs/jujutsu.nix
+++ b/users/modules/dev/vcs/jujutsu.nix
@ -45,6 +45,9 @@ in {
        default-command = "st";
        pager = ":builtin";
        show-cryptographic-signatures = true;
+        conflict-marker-style = "git"; # Support for vc-jj.el
+        diff-formatter = ":git"; # Support for vc-jj.el
+        diff-editor = ":builtin";
        inherit (cfg) editor;
      };
      signing = mkIf cfg.signing.enable {