Update: Diffview.nvim now has a merge tool!

• diffview.nvim

  61 3,344 6.9 Lua

  Single tabpage interface for easily cycling through diffs for all modified files for any git rev.

This was the longest standing feature request, so I'm happy to announce that I finally implemented a merge tool in a recent PR.

• git-conflict.nvim

  10 770 7.4 Lua

  A plugin to visualise and resolve merge conflicts in neovim

It offers a number of preset layouts, including three variations on a 3-way diff layout, one 4-way diff layout as well as a one plain single window layout (for when you prefer editing the conflict markers manually without the visual noise from diffs, or you're using something like git-conflict.nvim).

• InfluxDB

  www.influxdata.com sponsored

  Power Real-Time Data Analytics at Scale. Get real-time insights from all types of time series data with InfluxDB. Ingest, query, and analyze billions of data points in real-time with unbounded cardinality.

  

• oxocarbon.nvim

  7 431 6.7 Fennel

  Discontinued A dark and light Neovim theme written in fennel, inspired by IBM Carbon. [Moved to: https://github.com/nyoom-engineering/oxocarbon.nvim] (by shaunsingh)

  

I think he is using oxocarbon. There are two different versions of the theme: One written in rust and one written in lua.

• oxocarbon-lua.nvim

  4 84 7.5 Lua

  Discontinued A lua rewrite of the original oxocarbon theme.

I think he is using oxocarbon. There are two different versions of the theme: One written in rust and one written in lua.

• oxocarbon-lua.nvim

  1 4 1.4 Lua

  A lua rewrite of the original oxocarbon theme. (by sindrets)

The other person in your replies correctly guessed that it's Oxocarbon. I'm using a fork with some personal modifications.

• WorkOS

  workos.com sponsored

  The modern identity platform for B2B SaaS. The APIs are flexible and easy-to-use, supporting authentication, user identity, and complex enterprise features like SSO and SCIM provisioning.

  

Suggest a related project