From 1c7e5b9f05636419e4d9cf3549895629f06cb847 Mon Sep 17 00:00:00 2001
From: imxyy_soope_ <imxyy1soope1@gmail.com>
Date: Tue, 22 Jul 2025 12:43:03 +0800
Subject: [PATCH] feat(jj): set conflict-marker-style

---
 modules/cli/vcs/jj.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/cli/vcs/jj.nix b/modules/cli/vcs/jj.nix
index d677c9d..ffd5695 100644
--- a/modules/cli/vcs/jj.nix
+++ b/modules/cli/vcs/jj.nix
@@ -26,6 +26,7 @@ lib.my.makeHomeProgramConfig {
           ui = {
             graph.style = "square";
             default-command = "status";
+            conflict-marker-style = "snapshot";
           };
           signing = {
             backend = "ssh";