feat(jujutsu): adapt jj config for vc-jj.el in Emacs

2026-08-20 22:18:34 +02:00
parent 1031d91890
commit 3027c76245
1 changed files with 4 additions and 1 deletions
@@ -57,12 +57,15 @@ in {
          inherit (cfg) name email;
        };
        ui = {
+          inherit (cfg) editor;
          default-command = "st";
          pager = ":builtin";
          show-cryptographic-signatures = true;
          diff-editor = ":builtin";
          merge-editort = ":builtin";
-          inherit (cfg) editor;
+          # These are for vc-jj.el in Emacs
+          diff-formatter = ":git";
+          conflict-marker-style = "git";
        };
        signing = mkIf cfg.signing.enable {
          behavior = "own";