feat(jj): set conflict-marker-style

2025-07-22 12:43:03 +08:00
parent 1da34bf704
commit 1c7e5b9f05
1 changed files with 1 additions and 0 deletions
--- 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";