Skip to content

docs(jj): note conflict-marker-style for the marker-based keymaps #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlyongemallo merged 1 commit into from
Jul 1, 2026
Merged

docs(jj): note conflict-marker-style for the marker-based keymaps #277

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions doc/diffview.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (`<leader>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 (`<leader>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
Expand Down Expand Up @@ -269,13 +281,19 @@ 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
file (`:wqa`) returns control to Jujutsu, which checks for
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, `<leader>c[oOtTbBaA]` no-ops in {output}; the
whole-buffer variants (`<leader>cs*`) work either way.

*:DiffviewFileHistory*
:[range]DiffviewFileHistory [paths] [options]

Expand Down
Loading