From 06aa43af8772fdad86cfcb84177ce939602fde5e Mon Sep 17 00:00:00 2001 From: David Yonge-Mallo Date: Wed, 1 Jul 2026 22:16:00 +0200 Subject: [PATCH] docs(jj): fix `conflict-marker-style` value typo (should be `git` not `git-diff`) --- doc/diffview.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/diffview.txt b/doc/diffview.txt index 68ad1c65..80aa29de 100644 --- a/doc/diffview.txt +++ b/doc/diffview.txt @@ -151,7 +151,7 @@ COMMANDS *diffview-commands* so the marker-based actions (`c[oOtTbBaA]`, `[x`, `]x`, `d[xX]`) no-op in a Jujutsu repo. Set >toml [ui] - conflict-marker-style = "git-diff" + conflict-marker-style = "git" < in `~/.config/jj/config.toml` and Jujutsu will re-materialize the markers on the next working-copy snapshot. The whole-buffer @@ -281,7 +281,7 @@ COMMANDS *diffview-commands* "-c", "DiffviewMergeFiles $output $base $left $right", ] merge-tool-edits-conflict-markers = true - conflict-marker-style = "git-diff" + conflict-marker-style = "git" < With `merge-tool-edits-conflict-markers = true`, Jujutsu writes conflict markers into {output} before the editor opens. Saving the @@ -289,7 +289,7 @@ COMMANDS *diffview-commands* remaining markers to decide whether the conflict is resolved. To abort, exit with a non-zero status (`:cq`). - `conflict-marker-style = "git-diff"` picks the git-style markers + `conflict-marker-style = "git"` picks the git-style diff3 markers the marker-based actions (|diffview-actions-conflict_choose|) parse. Without it, `c[oOtTbBaA]` no-ops in {output}; the whole-buffer variants (`cs*`) work either way.