# rafikdraoui/jj-diffconflicts

<https://repo.masters-masters.com/en/repos/rafikdraoui/jj-diffconflicts>

[Home](https://repo.masters-masters.com/en) › [rafikdraoui](https://repo.masters-masters.com/en/owners/rafikdraoui) › [jj-diffconflicts](https://repo.masters-masters.com/en/repos/rafikdraoui/jj-diffconflicts)

rafikdraoui/jj-diffconflicts has 140 stars on GitHub. Its RepoMasters card: Prototype tier. A conflict resolution merge tool for Jujutsu VCS that runs in Neovim

| Field | Value |
| --- | --- |
| Owner | [rafikdraoui](https://repo.masters-masters.com/en/owners/rafikdraoui) |
| Stars | 140 |
| Forks | 6 |
| Language | [Lua](https://repo.masters-masters.com/en/languages/lua) |
| License | MIT |
| Created | 2024 |
| Topics | jujutsu, neovim, vimdiff |
| Tier | [Prototype (100 to 249 ★)](https://repo.masters-masters.com/en/ranks/rush) |
| View on GitHub | [rafikdraoui/jj-diffconflicts](https://github.com/rafikdraoui/jj-diffconflicts) |

## Repository

A conflict resolution merge tool for Jujutsu VCS that runs in Neovim

The tier for repos with 100 to 249 ★. Published odds per card pulled: 70%. Rarity: Common.

## Nearby in Lua

- [eero-lehtinen/oklch-color-picker.nvim · ★ 140 · Lua · Prototype](https://repo.masters-masters.com/en/repos/eero-lehtinen/oklch-color-picker.nvim)
- [Dan7h3x/LazyDo · ★ 140 · Lua · Prototype](https://repo.masters-masters.com/en/repos/Dan7h3x/LazyDo)
- [WilliamHsieh/overlook.nvim · ★ 140 · Lua · Prototype](https://repo.masters-masters.com/en/repos/WilliamHsieh/overlook.nvim)
- [geekscape/mqtt\_lua · ★ 140 · Lua · Prototype](https://repo.masters-masters.com/en/repos/geekscape/mqtt_lua)
- [daurnimator/luatz · ★ 140 · Lua · Prototype](https://repo.masters-masters.com/en/repos/daurnimator/luatz)
- [geoffleyland/lua-csv · ★ 140 · Lua · Prototype](https://repo.masters-masters.com/en/repos/geoffleyland/lua-csv)

---
Data: GitHub · Illustration drawn by RepoMasters from the repo’s ID and its language color.