Keyboard shortcuts

Press ← or → to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

Goal

In which you use your good, old merge tool.

Using the GUI

Before proceeding: do you prefer using a GUI tool such as kdiff3?
No problem:

jj resolve --tool kdiff3

Git Style Conflict Markers

Jujutsu is not an opinionated tool. Do you prefer Git-style conflict markers?
Configure your repo with:

jj config set --repo ui.conflict-marker-style git

and, presto!, you are back to your familiar format.