vimdiff comes as a pre-configured merge tool for jj
and can be used with jj resolve out of the box. However, the default configuration for
vimdiff as a diff editor (for jj split, etc.) is barely useable.
To more conveniently use Vim as a difftool for jj, try one of the following setups:
- Install the
DirDiffVim plugin.