Nicolas GBandGitHub 7fc91fe6d2 feat(resolve): add resolve command and log integration (#125) ...

Add first-class conflict resolution support to jj.nvim.

   - add `jj.cmd.resolve` to run `jj resolve` in a floating terminal or via an
     external tool
   - add `:J resolve` with support for `-r/--revision`, `--tool`,
     `--external/--ext`, and positional filesets
   - integrate resolve into the log buffer with the `gr` mapping and optional
     `resolve_strategies` picker
   - add `utils.is_change_conflicted()` and avoid opening resolve when the
     selected revision has no conflicts
   - document resolve usage, config, and keymaps in the README
   - add tests for resolve arg parsing and conflict detection helpers

2026-06-16 19:06:33 +02:00

..

jj

feat(resolve): add resolve command and log integration (#125)

2026-06-16 19:06:33 +02:00