A curated, actively-maintained list of awesome Jujutsu (jj) VCS resources.
Jujutsu (also known as jj) is a Git-compatible version control system. Source and contribution guide: hugoh/awesome-jj.
Last updated: 2026-11-01
Diff and Merge Drivers — Awesome JJ Diff and Merge Drivers- 0xferrous/jj-conflict.nvim — Neovim plugin for highlighting and resolving Jujutsu (jj) file conflicts, with multi-sided conflict support.
- diffedit3 — Edit diffs in a 3-pane view.
- hunk.nvim — A tool for splitting diffs in Neovim.
- jj-diff — Exploring better diff management for jj.
- jj-diff.el — Interactive Jujutsu (jj) diff and split tool for Emacs.
- jj-diffconflicts — A conflict resolution merge tool for Jujutsu VCS that runs in Neovim.
- larpios/jj-conflict.nvim — Neovim plugin for resolving and visualizing Jujutsu conflicts.
- Meld — Visual diff and merge tool.
- Mergiraf — A syntax-aware merge driver.
- Oyui — A modern TUI merge tool and staging interface for Jujutsu and Git.
- scm-record — The built-in diff editor for Jujutsu.
- vcmarkers.nvim — Neovim plugin that handles diff markers, supporting jj-style diffs and diff3.
- Weave — Entity-level semantic merge driver.