From 091498a46c39942aac5737a8dd537873afdb01e6 Mon Sep 17 00:00:00 2001 From: David Yonge-Mallo Date: Wed, 1 Jul 2026 12:47:00 +0200 Subject: [PATCH] docs(jj): note `conflict-marker-style` for the marker-based keymaps --- doc/diffview.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/doc/diffview.txt b/doc/diffview.txt index fce711ee..68ad1c65 100644 --- a/doc/diffview.txt +++ b/doc/diffview.txt @@ -146,6 +146,18 @@ COMMANDS *diffview-commands* For more info on these actions, see |diffview-actions-conflict_choose|. + NOTE: Jujutsu's default `conflict-marker-style = "diff"` emits + `+++++++` / `%%%%%%%` sections that the parser doesn't recognize, + 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" +< + in `~/.config/jj/config.toml` and Jujutsu will re-materialize the + markers on the next working-copy snapshot. The whole-buffer + variants (`cs*`) read from the side panes directly and + work regardless of marker style. + NOTE: The horizontal 3-way diff is only the default layout for the merge-tool, but there are multiple variations on the 3-way diff layout as well as a 4-way diff, and a single window layout available. The @@ -269,6 +281,7 @@ COMMANDS *diffview-commands* "-c", "DiffviewMergeFiles $output $base $left $right", ] merge-tool-edits-conflict-markers = true + conflict-marker-style = "git-diff" < With `merge-tool-edits-conflict-markers = true`, Jujutsu writes conflict markers into {output} before the editor opens. Saving the @@ -276,6 +289,11 @@ 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 + 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. + *:DiffviewFileHistory* :[range]DiffviewFileHistory [paths] [options]