jj-diffconflicts: a conflict resolution merge tool running in Neovim

[rafikdraoui]

I created a conflict resolution merge tool for Neovim: https://github.com/rafikdraoui/jj-diffconflicts. It's a port of whiteinge/diffconflicts that works with Jujutsu conflict markers.

There is more information about it and why one might want to use it in the README, but the main idea is that using a 2-way diff that is based on conflict markers can often make conflict resolution easier than using a classic 3-way diff. The 3-way diff view between the $base/$left/$right is still available (this can be useful to figure out the intent of the changes from the base ancestor), but for the actual resolution, using a 2-way vimdiff interface can be an improvement over manually editing the conflict markers.

That said, while the idea behind it is well-proven (at least in the context of Git conflict resolution), its implementation in this plugin is very much not so! Its only usage so far has been in my personal dotfiles for the past few weeks.

Also:

• It hasn't yet been used on a wide range of conflicts, so it's possible that it doesn't handle some situations very well (for example, multiple conflicts in the same file).
• It can only resolve one conflict at a time. When there are multiple conflicts, it will have to be invoked repeatedly until all of them have been addressed.
• It can only handle 2-sided conflicts (but this is also a limitation of jj resolve).
• Jujutsu is still evolving, so future versions could bring changes that the plugin can't handle yet. For example, conflict markers were changed between v0.17 and v0.18.

But I believe it's still worth giving it a try!