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

Using the GUI

Important

Use your good, old merge tool.

Jujutsu isn’t opinionated. Do you prefer a GUI like kdiff3 or meld?

jj resolve --tool meld
meld's UI showing the conflict to resolve

Git Style Conflict Markers

May be like Git-style markers? Sure, configure your repo:

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

Presto! You’re back to your familiar format.