wiff

Very interesting! If it only had a jj native support.

Some related tools I use:

• prr
  • a DSL that works very nice for me, inline comments within a patch/diff-like file.
    • I especially like that it support folds in vim (focusing on small parts, jumping between hunks).
  • breaks everything when upstream is updated if you have a WIP-prr session ongoing locally.
• haunt.nvim
  • vim's marks on steroids, allowing local only comments (still on the fence if this is better than just commenting inline in files)

I will try this out but a TUI rather than part of an editor usually leads to me abandoning the experiment.

Is there a cli tool that allows to compare 2+ unrelated files (as in no shared base, may not even be part of the same vsc tree, or no vsc at all) and produce a multi-side diff and/or extract shared base? The closest are unfortunately the vimdiff (very dubious ux) and meld (okaish ux, but only 2 sides, not terminal-based and cannot revert incorrectly accepted hunks).

No conflict resolution functionality required, but if it's there (and understands jj makers), that's obviously a plus.

Myself, I've become a big fan of https://github.com/nkzw-tech/codiff

It's Electron base is a negative but its use of Pierre Computer's diffs library[1] is worth it. I've used the LLM walkthrough feature for some bigger PRs but I don't normally need it.

[1] https://pierre.computer/writing/on-rendering-diffs