From 3027c762459df4cdf12ec1d817556c30ac561095 Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Thu, 20 Aug 2026 22:03:24 +0200
Subject: [PATCH] feat(jujutsu): adapt jj config for vc-jj.el in Emacs

---
 users/modules/dev/vcs/jujutsu.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/users/modules/dev/vcs/jujutsu.nix b/users/modules/dev/vcs/jujutsu.nix
index 9e8687f..182a712 100644
--- a/users/modules/dev/vcs/jujutsu.nix
+++ b/users/modules/dev/vcs/jujutsu.nix
@@ -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";