From 0d97edd9d9056f3208024e3e669f338a837cd09f Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Wed, 3 Sep 2025 11:45:12 +0200
Subject: [PATCH] feat(jujutsu): compatibility with jj-vc.el in Emacs

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

diff --git a/users/modules/dev/vcs/jujutsu.nix b/users/modules/dev/vcs/jujutsu.nix
index 29e6883..bbc0399 100644
--- 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 {