Sit with you through conflicts.
Conflict Resolution
jj treats conflicts as a state, not a wall. wyrm builds on that: three-way merge, hunk-by-hunk decisions, every step reversible.
What's included
- Three-way diff with syntax highlighting
- Accept theirs / ours / manual per hunk
- Conflicts stored in jj — never lose work
- Diverged bookmark resolution with preview